Skip to content
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.

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

updating the s3-resource to reference our fork and updating go version #22

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ ARG base_image
ARG builder_image=concourse/golang-builder

FROM ${builder_image} AS builder
COPY . /go/src/github.com/concourse/s3-resource
WORKDIR /go/src/github.com/concourse/s3-resource
COPY . /go/src/github.com/cloud-gov/s3-resource
WORKDIR /go/src/github.com/cloud-gov/s3-resource
ENV CGO_ENABLED=0
ENV AWS_USE_FIPS_ENDPOINT=true
RUN go mod download
RUN go build -o /assets/in github.com/concourse/s3-resource/cmd/in
RUN go build -o /assets/out github.com/concourse/s3-resource/cmd/out
RUN go build -o /assets/check github.com/concourse/s3-resource/cmd/check
WORKDIR /go/src/github.com/concourse/s3-resource
RUN go build -o /assets/in github.com/cloud-gov/s3-resource/cmd/in
RUN go build -o /assets/out github.com/cloud-gov/s3-resource/cmd/out
RUN go build -o /assets/check github.com/cloud-gov/s3-resource/cmd/check
WORKDIR /go/src/github.com/cloud-gov/s3-resource
RUN set -e; for pkg in $(go list ./...); do \
go test -o "/tests/$(basename $pkg).test" -c $pkg; \
done
Expand Down
4 changes: 2 additions & 2 deletions check/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package check
import (
"errors"

"github.com/concourse/s3-resource"
"github.com/concourse/s3-resource/versions"
s3resource "github.com/cloud-gov/s3-resource"
"github.com/cloud-gov/s3-resource/versions"
)

type Command struct {
Expand Down
6 changes: 3 additions & 3 deletions check/command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

s3resource "github.com/concourse/s3-resource"
"github.com/concourse/s3-resource/fakes"
s3resource "github.com/cloud-gov/s3-resource"
"github.com/cloud-gov/s3-resource/fakes"

. "github.com/concourse/s3-resource/check"
. "github.com/cloud-gov/s3-resource/check"
)

var _ = Describe("Check Command", func() {
Expand Down
2 changes: 1 addition & 1 deletion check/models.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package check

import "github.com/concourse/s3-resource"
import s3resource "github.com/cloud-gov/s3-resource"

type Request struct {
Source s3resource.Source `json:"source"`
Expand Down
4 changes: 2 additions & 2 deletions cmd/check/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"encoding/json"
"os"

s3resource "github.com/concourse/s3-resource"
"github.com/concourse/s3-resource/check"
s3resource "github.com/cloud-gov/s3-resource"
"github.com/cloud-gov/s3-resource/check"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/in/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"strings"

"github.com/aws/aws-sdk-go/aws"
s3resource "github.com/concourse/s3-resource"
"github.com/concourse/s3-resource/in"
s3resource "github.com/cloud-gov/s3-resource"
"github.com/cloud-gov/s3-resource/in"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/out/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"encoding/json"
"os"

s3resource "github.com/concourse/s3-resource"
"github.com/concourse/s3-resource/out"
s3resource "github.com/cloud-gov/s3-resource"
"github.com/cloud-gov/s3-resource/out"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion fakes/fake_s3client.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package fakes
import (
"sync"

s3resource "github.com/concourse/s3-resource"
s3resource "github.com/cloud-gov/s3-resource"
)

type FakeS3Client struct {
Expand Down
39 changes: 25 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,21 +1,32 @@
module github.com/concourse/s3-resource
module github.com/cloud-gov/s3-resource

go 1.13
go 1.23

require (
github.com/aws/aws-sdk-go v1.55.5
github.com/cheggaaa/pb v0.0.0-20150813110609-da1f27ad1d95
github.com/cheggaaa/pb v1.0.29
github.com/cppforlife/go-semi-semantic v0.0.0-20160921010311-576b6af77ae4
github.com/fatih/color v1.1.1-0.20170106221514-e8e01ee22a7d
github.com/golang/protobuf v1.4.2 // indirect
github.com/h2non/filetype v1.0.2-0.20170308102658-0df83c38d14f
github.com/mattn/go-colorable v0.0.7 // indirect
github.com/mattn/go-isatty v0.0.0-20161123143637-30a891c33c7c // indirect
github.com/mitchellh/colorstring v0.0.0-20150917214807-8631ce90f286
github.com/fatih/color v1.18.0
github.com/h2non/filetype v1.1.3
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db
github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
github.com/olekukonko/ts v0.0.0-20140412220145-ecf753e7c962 // indirect
github.com/onsi/ginkgo v1.2.1-0.20170102031522-a23f924ce96d
github.com/onsi/gomega v0.0.0-20161118205129-f1f0f388b31e
golang.org/x/sys v0.25.0 // indirect
gopkg.in/h2non/filetype.v1 v1.0.1 // indirect
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.35.1
)

require (
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/nxadm/tail v1.4.11 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.19.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading