chore: resolve merge conflicts

.github/workflows/golangci-lint.yml

@@ -27,10 +27,10 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           cache: false
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: latest
+          version: latest

Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
 
 ARG TAG
 ARG COMMIT
@@ -47,4 +47,4 @@ COPY LICENSE.txt /
 COPY third-party-licenses.txt /
 COPY --from=jq /jq /usr/local/bin/jq
 
-ENTRYPOINT [ "apigeecli" ]
+ENTRYPOINT [ "apigeecli" ]

go.sum

@@ -54,6 +54,7 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=

internal/apiclient/go.mod

@@ -1,3 +1,3 @@
 module apiclient
 
-go 1.20
+go 1.21

internal/bundlegen/go.mod

@@ -1,3 +1,3 @@
 module bundlegen
 
-go 1.20
+go 1.21

internal/client/go.mod

@@ -1,3 +1,3 @@
 module client
 
-go 1.20
+go 1.21

internal/clilog/go.mod

@@ -1,3 +1,3 @@
 module clilog
 
-go 1.20
+go 1.21