[KIE-830] Make Kogito Operator build reproducible

.github/workflows/Kogito-Operator-PR-Check.yaml

@@ -8,7 +8,7 @@ on:
       - "LICENSE"
       - "Makefile"
 env:
-  GO_VERSION: 1.17
+  GO_VERSION: 1.21
 jobs:
   golint:
     name: Lint

.github/workflows/Kogito-Operator-Unit-tests.yaml

@@ -8,7 +8,7 @@ on:
       - 'core/**.go'
       - 'cmd/**.go'
 env:
-  GO_VERSION: 1.17
+  GO_VERSION: 1.21
 jobs:
   unit_test_and_coverage:
     name: Unit test and Coverage

Makefile

@@ -151,11 +151,12 @@ csv: install-operator-sdk
 ##@ Build
 
 build: generate fmt vet ## Build manager binary.
-	go build -o bin/manager main.go
+	go build -trimpath -ldflags=-buildid= -a -o bin/manager main.go
 
 run: manifests generate fmt vet ## Run a controller from your host.
 	go run ./main.go
 
+.PHONY: container-build
 container-build: ## Build the docker image
 	echo "calling APP container-build ##################################"
 	cekit -v --descriptor kogito-image.yaml build $(BUILDER)

PROJECT

@@ -5,7 +5,7 @@ plugins:
   manifests.sdk.operatorframework.io/v2: {}
   scorecard.sdk.operatorframework.io/v2: {}
 projectName: kogito-operator
-repo: github.com/kiegroup/kogito-operator
+repo: github.com/apache/incubator-kie-kogito-operator
 resources:
 - api:
     crdVersion: v1
@@ -14,7 +14,7 @@ resources:
   domain: kiegroup.org
   group: app
   kind: KogitoRuntime
-  path: github.com/kiegroup/kogito-operator/apis/app
+  path: github.com/apache/incubator-kie-kogito-operator/apis/app
   version: v1beta1
 - api:
     crdVersion: v1
@@ -23,7 +23,7 @@ resources:
   domain: kiegroup.org
   group: app
   kind: KogitoSupportingService
-  path: github.com/kiegroup/kogito-operator/apis/app
+  path: github.com/apache/incubator-kie-kogito-operator/apis/app
   version: v1beta1
 - api:
     crdVersion: v1
@@ -32,7 +32,7 @@ resources:
   domain: kiegroup.org
   group: app
   kind: KogitoBuild
-  path: github.com/kiegroup/kogito-operator/apis/app
+  path: github.com/apache/incubator-kie-kogito-operator/apis/app
   version: v1beta1
 - api:
     crdVersion: v1
@@ -41,7 +41,7 @@ resources:
   domain: kiegroup.org
   group: app
   kind: KogitoInfra
-  path: github.com/kiegroup/kogito-operator/apis/app
+  path: github.com/apache/incubator-kie-kogito-operator/apis/app
   version: v1beta1
 - api:
     crdVersion: v1
@@ -50,7 +50,7 @@ resources:
   domain: kiegroup.org
   group: rhpam
   kind: KogitoRuntime
-  path: github.com/kiegroup/kogito-operator/apis/rhpam
+  path: github.com/apache/incubator-kie-kogito-operator/apis/rhpam
   version: v1
 - api:
     crdVersion: v1
@@ -59,7 +59,7 @@ resources:
   domain: kiegroup.org
   group: rhpam
   kind: KogitoSupportingService
-  path: github.com/kiegroup/kogito-operator/apis/rhpam
+  path: github.com/apache/incubator-kie-kogito-operator/apis/rhpam
   version: v1
 - api:
     crdVersion: v1
@@ -68,7 +68,7 @@ resources:
   domain: kiegroup.org
   group: rhpam
   kind: KogitoBuild
-  path: github.com/kiegroup/kogito-operator/apis/rhpam
+  path: github.com/apache/incubator-kie-kogito-operator/apis/rhpam
   version: v1
 - api:
     crdVersion: v1
@@ -77,7 +77,7 @@ resources:
   domain: kiegroup.org
   group: rhpam
   kind: KogitoInfra
-  path: github.com/kiegroup/kogito-operator/apis/rhpam
+  path: github.com/apache/incubator-kie-kogito-operator/apis/rhpam
   version: v1
 version: "3"
 multigroup: true

README.md

@@ -1,8 +1,8 @@
 # Kogito Operator
 
-[![Go Report Card](https://goreportcard.com/badge/github.com/kiegroup/kogito-operator)](https://goreportcard.com/report/github.com/kiegroup/kogito-operator)
+[![Go Report Card](https://goreportcard.com/badge/github.com/apache/incubator-kie-kogito-operator)](https://goreportcard.com/report/github.com/apache/incubator-kie-kogito-operator)
 
-The Kogito Operator deploys [Kogito Runtimes](https://github.com/kiegroup/kogito-runtimes) services from source and all infrastructure requirements for the services, such as persistence with [Infinispan](https://infinispan.org/) and messaging with [Apache Kafka](https://kafka.apache.org/). Kogito provides a command-line interface (CLI) that enables you to interact with the Kogito Operator for deployment tasks.
+The Kogito Operator deploys [Kogito Runtimes](https://github.com/apache/incubator-kie-kogito-runtimes) services from source and all infrastructure requirements for the services, such as persistence with [Infinispan](https://infinispan.org/) and messaging with [Apache Kafka](https://kafka.apache.org/). Kogito provides a command-line interface (CLI) that enables you to interact with the Kogito Operator for deployment tasks.
 
 For information about the Kogito Operator architecture and instructions for using the operator and CLI to deploy Kogito services and infrastructures, see the official [Kogito Documentation](https://docs.jboss.org/kogito/release/latest/html_single/#chap-kogito-deploying-on-openshift) page.
 
@@ -40,10 +40,10 @@ You can quickly install the operator in your local cluster by executing the foll
 
 ```shell script
 VERSION=<current_operator_version>
-kubectl apply -f "https://github.com/kiegroup/kogito-operator/releases/download/${VERSION}/kogito-operator.yaml"
+kubectl apply -f "https://github.com/apache/incubator-kie-kogito-operator/releases/download/${VERSION}/kogito-operator.yaml"
 ```
 
-Replace the version above to match your context (example v1.8.0). The version information you can grab from the [releases page](https://github.com/kiegroup/kogito-operator/releases).
+Replace the version above to match your context (example v1.8.0). The version information you can grab from the [releases page](https://github.com/apache/incubator-kie-kogito-operator/releases).
 
 Alternatively, if you cloned this repo just do:
 
@@ -64,10 +64,10 @@ in your Golang project. For this to  work, you just have to import our `client`
 
 ```shell script
 # client depends on the `api` module
-go install github.com/kiegroup/kogito-operator/client@{VERSION}
+go install github.com/apache/incubator-kie-kogito-operator/client@{VERSION}
 ```
 
-Replace `{VERSION}` with the [latest release](https://github.com/kiegroup/kogito-operator/releases).
+Replace `{VERSION}` with the [latest release](https://github.com/apache/incubator-kie-kogito-operator/releases).
 
 The `client` module will provide your project with the Kubernetes client 
 for Kogito custom resources such as `KogitoRuntime` and `KogitoBuild`.
@@ -105,7 +105,7 @@ In general, the unit tests that are provided with the Kogito Operator are based
 
 ### Kogito Operator collaboration and pull requests
 
-Before you start to work on a new proposed feature or on a fix for a bug, [open an issue](https://github.com/kiegroup/kogito-operator/issues) to discuss your idea or bug report with the maintainers. You can also work on a [JIRA issue](https://issues.jboss.org/issues/?jql=project+%3D+KOGITO+AND+component+%3D+Operator) that has been reported. A developer might already be assigned to address the issue, but you can leave a comment in the JIRA asking if they need some help.
+Before you start to work on a new proposed feature or on a fix for a bug, [open an issue](https://github.com/apache/incubator-kie-kogito-operator/issues) to discuss your idea or bug report with the maintainers. You can also work on a [JIRA issue](https://issues.jboss.org/issues/?jql=project+%3D+KOGITO+AND+component+%3D+Operator) that has been reported. A developer might already be assigned to address the issue, but you can leave a comment in the JIRA asking if they need some help.
 
 After you update the source with your new proposed feature or bug fix, open a [pull request (PR)](https://help.github.com/en/articles/about-pull-requests) that meets the following requirements:
 
@@ -119,7 +119,7 @@ After you update the source with your new proposed feature or bug fix, open a [p
 
 After you send your PR, a maintainer will review your code and might ask you to make changes and to [squash your commits](https://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git) before we can merge.
 
-If you have any questions, contact a Kogito Operator maintainer in the [issues page](https://github.com/kiegroup/kogito-operator/issues).
+If you have any questions, contact a Kogito Operator maintainer in the [issues page](https://github.com/apache/incubator-kie-kogito-operator/issues).
 
 ## Kogito Operator development
 
@@ -138,7 +138,7 @@ For code contributions, review the following prerequisites:
 - [Docker](https://www.docker.com/)
 - [Operator Courier](https://github.com/operator-framework/operator-courier) is used to build, validate and push Operator Artifacts
 - [Operator SDK](https://github.com/operator-framework/operator-sdk) v1.21.0
-- [Go](https://golang.org/) v1.17 is installed.
+- [Go](https://golang.org/) v1.21 is installed.
 - [Golint dependency](https://pkg.go.dev/golang.org/x/lint/golint): go install golang.org/x/lint/golint@latest
 - [Golangci-lint](https://golangci-lint.run/usage/install/)
 - [Python 3.x](https://www.python.org/downloads/) v3.x is installed
@@ -298,7 +298,7 @@ You can set those optional keys:
 - `services_image_name_suffix` sets the global services image name suffix to append to usual image names.
 - `services_image_version` sets the global services image version.
 <!--- build -->
-- `custom_maven_repo_url` sets a custom Maven repository url for S2I builds, in case your artifacts are in a specific repository. See https://github.com/kiegroup/kogito-images/README.md for more information.
+- `custom_maven_repo_url` sets a custom Maven repository url for S2I builds, in case your artifacts are in a specific repository. See https://github.com/apache/incubator-kie-kogito-images/README.md for more information.
 - `maven_mirror_url` is the Maven mirror URL.  
   This is helpful when you need to speed up the build time by referring to a closer Maven repository.
 - `quarkus_platform_maven_mirror_url` is the Maven mirror url to be used when building app from source files with Quarkus, using the quarkus maven plugin.
@@ -308,7 +308,7 @@ You can set those optional keys:
 - `disable_maven_native_build_container` disables the default Maven native build done in container.
 <!--- examples repository -->
 - `examples_uri` sets the URI for the kogito-examples repository.  
-  *Default is https://github.com/kiegroup/kogito-examples*.
+  *Default is https://github.com/apache/incubator-kie-kogito-examples*.
 - `examples_ref` sets the branch for the kogito-examples repository.
 <!--- build runtime applications -->
 - `runtime_application_image_registry` sets the registry for built runtime applications.

apis/app/v1beta1/kogitobuild_types.go

@@ -18,7 +18,7 @@
 package v1beta1
 
 import (
-	"github.com/kiegroup/kogito-operator/apis"
+	"github.com/apache/incubator-kie-kogito-operator/apis"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

apis/app/v1beta1/kogitobuild_types_test.go

@@ -18,7 +18,7 @@
 package v1beta1
 
 import (
-	"github.com/kiegroup/kogito-operator/apis"
+	"github.com/apache/incubator-kie-kogito-operator/apis"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"

apis/app/v1beta1/kogitoinfra_types.go

@@ -18,7 +18,7 @@
 package v1beta1
 
 import (
-	"github.com/kiegroup/kogito-operator/apis"
+	"github.com/apache/incubator-kie-kogito-operator/apis"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

apis/app/v1beta1/kogitoinfra_types_test.go

@@ -18,7 +18,7 @@
 package v1beta1
 
 import (
-	"github.com/kiegroup/kogito-operator/apis"
+	"github.com/apache/incubator-kie-kogito-operator/apis"
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"testing"

apis/app/v1beta1/kogitoruntime_types.go

@@ -18,7 +18,7 @@
 package v1beta1
 
 import (
-	api "github.com/kiegroup/kogito-operator/apis"
+	api "github.com/apache/incubator-kie-kogito-operator/apis"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

apis/app/v1beta1/kogitoservices.go

@@ -18,7 +18,7 @@
 package v1beta1
 
 import (
-	api "github.com/kiegroup/kogito-operator/apis"
+	api "github.com/apache/incubator-kie-kogito-operator/apis"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"

apis/app/v1beta1/kogitosupportingservice_types.go

@@ -18,7 +18,7 @@
 package v1beta1
 
 import (
-	api "github.com/kiegroup/kogito-operator/apis"
+	api "github.com/apache/incubator-kie-kogito-operator/apis"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

apis/app/v1beta1/kogitosupportingservice_types_test.go

@@ -18,7 +18,7 @@
 package v1beta1
 
 import (
-	"github.com/kiegroup/kogito-operator/apis"
+	"github.com/apache/incubator-kie-kogito-operator/apis"
 	"github.com/stretchr/testify/assert"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"testing"

apis/app/v1beta1/webhook.go

@@ -17,7 +17,7 @@
 
 package v1beta1
 
-import "github.com/kiegroup/kogito-operator/apis"
+import "github.com/apache/incubator-kie-kogito-operator/apis"
 
 // WebHookSecret Secret to use for a given webHook.
 // +k8s:openapi-gen=true

apis/go.mod

@@ -1,6 +1,6 @@
-module github.com/kiegroup/kogito-operator/apis
+module github.com/apache/incubator-kie-kogito-operator/apis
 
-go 1.17
+go 1.21
 
 require (
 	github.com/stretchr/testify v1.8.0

apis/go.sum

@@ -352,7 +352,6 @@ github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijb
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
@@ -383,7 +382,6 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU=
 golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -416,7 +414,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -446,9 +443,6 @@ golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -464,7 +458,6 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -501,16 +494,8 @@ golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -519,8 +504,6 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -572,7 +555,6 @@ golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=