Skip to content

Remove the relative import to the utils subpackage. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2017
+6 −5
Merged

Remove the relative import to the utils subpackage. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions agent/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ RUN apt-get update && apt-get upgrade -y && \
ca-certificates \
git \
wget && \
mkdir -p /opt/bin
mkdir -p /opt/bin && \
mkdir -p /opt/src/github.com/google/inverting-proxy

ADD ./ /src
ADD ./ /opt/src/github.com/google/inverting-proxy/agent

RUN wget -O /opt/go1.6.2.linux-amd64.tar.gz \
https://storage.googleapis.com/golang/go1.6.2.linux-amd64.tar.gz && \
Expand All @@ -32,7 +33,7 @@ RUN wget -O /opt/go1.6.2.linux-amd64.tar.gz \
go get golang.org/x/net/context && \
go get golang.org/x/oauth2/google && \
go get google.golang.org/api/compute/v1 && \
go build -o ${GOPATH}/bin/proxy-forwarding-agent /src/agent.go && \
go build -o ${GOPATH}/bin/proxy-forwarding-agent /opt/src/github.com/google/inverting-proxy/agent/agent.go && \
rm -rf /opt/go1.4.2.linux-amd64.tar.gz && \
rm -rf /usr/local

Expand Down
2 changes: 1 addition & 1 deletion agent/agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (
"golang.org/x/oauth2/google"
compute "google.golang.org/api/compute/v1"

"./utils"
"github.com/google/inverting-proxy/agent/utils"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion agent/utils/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ func TestParseRequestFromProxyResponse(t *testing.T) {
if err != nil {
t.Fatal(err)
}
if forwardedRequest.BackendID != "some-backend" || forwardedRequest.RequestID != "some-request" || forwardedRequest.User != "someone" || forwardedRequest.StartTime != mockStartTime {
if forwardedRequest.BackendID != "some-backend" || forwardedRequest.RequestID != "some-request" || forwardedRequest.User != "someone" || !(forwardedRequest.StartTime.Equal(mockStartTime)) {
t.Fatal("Unexpected request parsed from a proxy response")
}
}