Skip to content

Commit e1f45dd

Browse files
JoelSpeedJoelSpeed
authored
Merge pull request ploxiln#7 from pusher/migration
Migration from Bitly to Pusher
2 parents a94b0a8 + f80ce24 commit e1f45dd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+958
-444
lines changed

‎.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Default owner should be a Pusher cloud-team member unless overridden by later
2+
# rules in this file
3+
* @pusher/cloud-team

‎.github/ISSUE_TEMPLATE.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<!--- Provide a general summary of the issue in the Title above -->
2+
3+
## Expected Behavior
4+
5+
<!--- If you're describing a bug, tell us what should happen -->
6+
<!--- If you're suggesting a change/improvement, tell us how it should work -->
7+
8+
## Current Behavior
9+
10+
<!--- If describing a bug, tell us what happens instead of the expected behavior -->
11+
<!--- If suggesting a change/improvement, explain the difference from current behavior -->
12+
13+
## Possible Solution
14+
15+
<!--- Not obligatory, but suggest a fix/reason for the bug, -->
16+
<!--- or ideas how to implement the addition or change -->
17+
18+
## Steps to Reproduce (for bugs)
19+
20+
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
21+
<!--- reproduce this bug. Include code to reproduce, if relevant -->
22+
23+
1. <!--- Step 1 --->
24+
2. <!--- Step 2 --->
25+
3. <!--- Step 3 --->
26+
4. <!--- Step 4 --->
27+
28+
## Context
29+
30+
<!--- How has this issue affected you? What are you trying to accomplish? -->
31+
<!--- Providing context helps us come up with a solution that is most useful in the real world -->
32+
33+
## Your Environment
34+
35+
<!--- Include as many relevant details about the environment you experienced the bug in -->
36+
37+
- Version used:

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!--- Provide a general summary of your changes in the Title above -->
2+
3+
## Description
4+
5+
<!--- Describe your changes in detail -->
6+
7+
## Motivation and Context
8+
9+
<!--- Why is this change required? What problem does it solve? -->
10+
<!--- If it fixes an open issue, please link to the issue here. -->
11+
12+
## How Has This Been Tested?
13+
14+
<!--- Please describe in detail how you tested your changes. -->
15+
<!--- Include details of your testing environment, and the tests you ran to -->
16+
<!--- see how your change affects other areas of the code, etc. -->
17+
18+
## Checklist:
19+
20+
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
21+
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
22+
23+
- [ ] My change requires a change to the documentation or CHANGELOG.
24+
- [ ] I have updated the documentation/CHANGELOG accordingly.
25+
- [ ] I have created a feature (non-master) branch for my PR.

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ vendor
33
dist
44
.godeps
55
*.exe
6-
6+
.env
77

88
# Go.gitignore
99
# Compiled Object files, Static and Dynamic libs (Shared Objects)

‎.travis.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
language: go
22
go:
3-
- 1.8.x
43
- 1.9.x
5-
script:
4+
- 1.10.x
5+
install:
6+
# Fetch dependencies
67
- wget -O dep https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64
78
- chmod +x dep
8-
- ./dep ensure
9-
- ./test.sh
9+
- mv dep $GOPATH/bin/dep
10+
script:
11+
- ./configure
12+
# Run tests
13+
- make test
1014
sudo: false
1115
notifications:
1216
email: false

‎CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Vx.x.x (Pre-release)
2+
3+
## Changes since v2.2:
4+
5+
- Move automated build to debian base image
6+
- Add Makefile
7+
- Update CI to run `make test`
8+
- Update Dockerfile to use `make clean oauth2_proxy`
9+
- Update `VERSION` parameter to be set by `ldflags` from Git Status
10+
- Remove lint and test scripts
11+
- Remove Go v1.8.x from Travis CI testing
12+
- Add CODEOWNERS file
13+
- Add CONTRIBUTING guide
14+
- Add Issue and Pull Request templates
15+
- Add Dockerfile
16+
- Fix fsnotify import
17+
- Update README to reflect new repository ownership
18+
- Update CI scripts to separate linting and testing
19+
- Now using `gometalinter` for linting
20+
- Move Go import path from `github.com/bitly/oauth2_proxy` to `github.com/pusher/oauth2_proxy`
21+
- Repository forked on 27/11/18
22+
- README updated to include note that this repository is forked
23+
- CHANGLOG created to track changes to repository from original fork

‎CONTRIBUTING.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Contributing
2+
3+
To develop on this project, please fork the repo and clone into your `$GOPATH`.
4+
5+
Dependencies are **not** checked in so please download those separately.
6+
Download the dependencies using [`dep`](https://github.com/golang/dep).
7+
8+
```bash
9+
cd $GOPATH/src/github.com # Create this directory if it doesn't exist
10+
git clone [email protected]:<YOUR_FORK>/oauth2_proxy pusher/oauth2_proxy
11+
make dep
12+
```
13+
14+
## Pull Requests and Issues
15+
16+
We track bugs and issues using Github.
17+
18+
If you find a bug, please open an Issue.
19+
20+
If you want to fix a bug, please fork, create a feature branch, fix the bug and
21+
open a PR back to this repo.
22+
Please mention the open bug issue number within your PR if applicable.

‎Dockerfile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM golang:1.10 AS builder
2+
WORKDIR /go/src/github.com/pusher/oauth2_proxy
3+
COPY . .
4+
5+
# Fetch dependencies
6+
RUN go get -u github.com/golang/dep/cmd/dep
7+
RUN dep ensure --vendor-only
8+
9+
# Build image
10+
RUN ./configure && make clean oauth2_proxy
11+
12+
# Copy binary to debian
13+
FROM debian:stretch
14+
COPY --from=builder /go/src/github.com/pusher/oauth2_proxy/oauth2_proxy /bin/oauth2_proxy
15+
16+
ENTRYPOINT ["/bin/oauth2_proxy"]

‎Gopkg.lock

Lines changed: 58 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
# for detailed Gopkg.toml documentation.
44
#
55

6-
[[constraint]]
7-
name = "github.com/18F/hmacauth"
8-
version = "~1.0.1"
9-
106
[[constraint]]
117
name = "github.com/BurntSushi/toml"
128
version = "~0.3.0"
@@ -36,7 +32,7 @@
3632
name = "google.golang.org/api"
3733

3834
[[constraint]]
39-
name = "gopkg.in/fsnotify.v1"
35+
name = "gopkg.in/fsnotify/fsnotify.v1"
4036
version = "~1.2.0"
4137

4238
[[constraint]]

0 commit comments

Comments
 (0)