From 07cb0596fa97e74e479323cc80e6be5708d8aaec Mon Sep 17 00:00:00 2001 From: Justin Gallardo Date: Fri, 5 May 2023 16:54:05 -0700 Subject: [PATCH 1/2] github.com/ConductorOne/baton-asana => github.com/conductorone/baton-asana --- cmd/baton-asana/main.go | 2 +- go.mod | 4 ++-- pkg/connector/connector.go | 2 +- pkg/connector/team.go | 2 +- pkg/connector/user.go | 2 +- pkg/connector/workspace.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/baton-asana/main.go b/cmd/baton-asana/main.go index 1be84c5..68b62e9 100644 --- a/cmd/baton-asana/main.go +++ b/cmd/baton-asana/main.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/ConductorOne/baton-asana/pkg/connector" + "github.com/conductorone/baton-asana/pkg/connector" "github.com/conductorone/baton-sdk/pkg/cli" "github.com/conductorone/baton-sdk/pkg/connectorbuilder" "github.com/conductorone/baton-sdk/pkg/sdk" diff --git a/go.mod b/go.mod index 3596be4..838a6ca 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,11 @@ -module github.com/ConductorOne/baton-asana +module github.com/conductorone/baton-asana go 1.19 require ( github.com/conductorone/baton-sdk v0.0.22 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 + github.com/spf13/cobra v1.6.1 go.uber.org/zap v1.24.0 ) @@ -48,7 +49,6 @@ require ( github.com/segmentio/ksuid v1.0.4 // indirect github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect - github.com/spf13/cobra v1.6.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.15.0 // indirect diff --git a/pkg/connector/connector.go b/pkg/connector/connector.go index 92da238..0b97373 100644 --- a/pkg/connector/connector.go +++ b/pkg/connector/connector.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/ConductorOne/baton-asana/pkg/asana" + "github.com/conductorone/baton-asana/pkg/asana" v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2" "github.com/conductorone/baton-sdk/pkg/annotations" "github.com/conductorone/baton-sdk/pkg/connectorbuilder" diff --git a/pkg/connector/team.go b/pkg/connector/team.go index 9bdcc01..8771c4c 100644 --- a/pkg/connector/team.go +++ b/pkg/connector/team.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/ConductorOne/baton-asana/pkg/asana" + "github.com/conductorone/baton-asana/pkg/asana" v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2" "github.com/conductorone/baton-sdk/pkg/annotations" "github.com/conductorone/baton-sdk/pkg/pagination" diff --git a/pkg/connector/user.go b/pkg/connector/user.go index 46a1fed..f6cd9e6 100644 --- a/pkg/connector/user.go +++ b/pkg/connector/user.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/ConductorOne/baton-asana/pkg/asana" + "github.com/conductorone/baton-asana/pkg/asana" v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2" "github.com/conductorone/baton-sdk/pkg/annotations" "github.com/conductorone/baton-sdk/pkg/pagination" diff --git a/pkg/connector/workspace.go b/pkg/connector/workspace.go index 1c68cbe..c9baceb 100644 --- a/pkg/connector/workspace.go +++ b/pkg/connector/workspace.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/ConductorOne/baton-asana/pkg/asana" + "github.com/conductorone/baton-asana/pkg/asana" v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2" "github.com/conductorone/baton-sdk/pkg/annotations" "github.com/conductorone/baton-sdk/pkg/pagination" From 463824643415c88da32d51c152efcedfb0d27b2f Mon Sep 17 00:00:00 2001 From: Justin Gallardo Date: Fri, 5 May 2023 18:07:28 -0700 Subject: [PATCH 2/2] Update ci workflows for go 1.20 --- .github/workflows/ci.yaml | 8 ++++---- .github/workflows/main.yaml | 6 +++--- .github/workflows/release.yaml | 16 ++++++++-------- go.mod | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7ce782e..0941f21 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,9 +5,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19.x + go-version: 1.20.x - name: Checkout code uses: actions/checkout@v3 - name: Run linters @@ -18,13 +18,13 @@ jobs: go-test: strategy: matrix: - go-version: [1.18.x, 1.19.x] + go-version: [1.20.x] platform: [ubuntu-latest] runs-on: ${{ matrix.platform }} steps: - name: Install Go if: success() - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: go-version: ${{ matrix.go-version }} - name: Checkout code diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 88eebee..8261860 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -8,9 +8,9 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: 1.19.x + go-version: 1.20.x - name: Checkout code uses: actions/checkout@v3 - name: Run linters @@ -21,7 +21,7 @@ jobs: go-test: strategy: matrix: - go-version: [ 1.18.x, 1.19.x ] + go-version: [ 1.20.x ] platform: [ ubuntu-latest ] runs-on: ${{ matrix.platform }} steps: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 3838aa5..11b9335 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -14,9 +14,9 @@ jobs: with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.20.x - name: Set up Gon run: brew tap mitchellh/gon && brew install mitchellh/gon/gon - name: Import Keychain Certs @@ -25,10 +25,10 @@ jobs: p12-file-base64: ${{ secrets.APPLE_SIGNING_KEY_P12 }} p12-password: ${{ secrets.APPLE_SIGNING_KEY_P12_PASSWORD }} - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v2 + uses: goreleaser/goreleaser-action@v4 with: version: latest - args: release --rm-dist + args: release --clean env: GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }} AC_PASSWORD: ${{ secrets.AC_PASSWORD }} @@ -40,9 +40,9 @@ jobs: with: fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v4 with: - go-version: 1.19 + go-version: 1.20.x - name: Docker Login uses: docker/login-action@v1 with: @@ -52,9 +52,9 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v2 + uses: goreleaser/goreleaser-action@v4 with: version: latest - args: release --rm-dist -f .goreleaser.docker.yaml + args: release --clean -f .goreleaser.docker.yaml env: GITHUB_TOKEN: ${{ secrets.RELENG_GITHUB_TOKEN }} \ No newline at end of file diff --git a/go.mod b/go.mod index 838a6ca..33dc817 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/conductorone/baton-asana -go 1.19 +go 1.20 require ( github.com/conductorone/baton-sdk v0.0.22