diff --git a/.github/workflows/release-gencert.yaml b/.github/workflows/release-gencert.yaml
deleted file mode 100644
index 3da97f375504d4a990aaf8d13da18d34c870148c..0000000000000000000000000000000000000000
--- a/.github/workflows/release-gencert.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Release gencert image
-
-on:
- pull_request:
- branches:
- - master
- push:
- branches:
- - master
-
-jobs:
- build_and_release_gencert:
- runs-on: ubuntu-latest
- steps:
- - name: Checkout
- uses: actions/checkout@v3
- with:
- fetch-depth: 0
-
- - name: Python Version
- uses: actions/setup-python@v4
- with:
- python-version: '3.10'
-
- - name: Install Poetry
- uses: snok/install-poetry@v1
-
- - name: Log in to registry
- # This is where you will update the PAT to GITHUB_TOKEN
- run: echo "${{ secrets.PKG_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
-
- - name: Build and push
- env:
- GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }}
- run: |
- if [[ $(git branch --show-current) != "master" ]];then
- export GENCERT_VERSION=0.0.0-$(git rev-parse --short HEAD)
- fi
- make release-gencert
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 03169382fa28a993e52a5928a3f0e4d2bb6a4588..5139850d8388cecb4dd19d3aa3416687d5fa323c 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -1,9 +1,9 @@
-name: Run Build
+name: Build Terraform Operator Container Image
on: [push]
jobs:
- amd64build:
+ Terraform-Operator-AMD_x86_64:
runs-on: ubuntu-latest
steps:
- name: Checkout
@@ -14,19 +14,16 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
- go-version: 1.19
+ go-version: "1.20"
- - name: Login to Docker Hub
- uses: docker/login-action@v2
- with:
- username: ${{ secrets.DOCKERHUB_USER }}
- password: ${{ secrets.DOCKERHUB_PASS }}
+ - name: Log in to registry
+ run: echo "${{ secrets.PKG_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
- name: Build and push amd64
run: |
make docker-build-local docker-push
- arm64build:
+ Terraform-Operator-ARM64:
runs-on: [arm64]
steps:
- name: Checkout
@@ -34,38 +31,31 @@ jobs:
with:
fetch-depth: 0
- # The arm64 custom runner already has golang installed
- name: Set up Go
uses: actions/setup-go@v2
with:
- go-version: 1.19
+ go-version: "1.20"
- - name: Login to Docker Hub
- uses: docker/login-action@v2
- with:
- username: ${{ secrets.DOCKERHUB_USER }}
- password: ${{ secrets.DOCKERHUB_PASS }}
+ - name: Log in to registry
+ run: echo "${{ secrets.PKG_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
- name: Build and push arm64
run: |
make docker-build-local-arm docker-push-arm
- release:
+ Release-Terraform-Operator:
runs-on: [pi]
needs:
- - amd64build
- - arm64build
+ - Terraform-Operator-AMD_x86_64
+ - Terraform-Operator-ARM64
steps:
- name: Checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- - name: Login to Docker Hub
- uses: docker/login-action@v2
- with:
- username: ${{ secrets.DOCKERHUB_USER }}
- password: ${{ secrets.DOCKERHUB_PASS }}
+ - name: Log in to registry
+ run: echo "${{ secrets.PKG_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
- name: Build and push amd64
run: |
diff --git a/.gitignore b/.gitignore
index 21eb7705121d8a8bf426c2e79326c708264e839b..debfc022daf8a15cb147334da839277c848031f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,10 +113,11 @@ tags
# End of https://www.gitignore.io/api/go,vim,emacs,visualstudiocode
+# my release management dir
bin
.builds
-# my release management dir
.rmgmt
+old
# Bundles that are dirty
deploy/bundles/*dirty*
diff --git a/Makefile b/Makefile
index c87bd696c18d56531a773f377f73fda857919a64..9203b60e0f29d8738da68f53ad80f8be876805b3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-PKG ?= github.com/isaaguilar/terraform-operator
-DOCKER_REPO ?= isaaguilar
+PKG ?= github.com/galleybytes/terraform-operator
+DOCKER_REPO ?= ghcr.io/galleybytes
IMAGE_NAME ?= terraform-operator
DEPLOYMENT ?= ${IMAGE_NAME}
NAMESPACE ?= tf-system
@@ -77,21 +77,19 @@ endif
# rbac:roleName=manager-role
# Generate manifests e.g. CRD, RBAC etc.
crds: controller-gen
- $(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./..." output:crd:stdout > deploy/crds/tf.isaaguilar.com_terraforms_crd.yaml
+ $(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./..." output:crd:stdout > deploy/crds/tf.galleybytes.com_terraforms_crd.yaml
generate: controller-gen
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
openapi-gen: openapi-gen-bin
- $(OPENAPI_GEN) --logtostderr=true -o "" -i github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1 -O zz_generated.openapi -p pkg/apis/tf/v1alpha1 -h ./hack/boilerplate.go.txt -r "-"
- $(OPENAPI_GEN) --logtostderr=true -o "" -i github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2 -O zz_generated.openapi -p pkg/apis/tf/v1alpha2 -h ./hack/boilerplate.go.txt -r "-"
+ $(OPENAPI_GEN) --logtostderr=true -o "" -i github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1 -O zz_generated.openapi -p pkg/apis/tf/v1beta1 -h ./hack/boilerplate.go.txt -r "-"
docs:
/bin/bash hack/docs.sh ${VERSION}
client-gen: client-gen-bin
- $(CLIENT_GEN) -n versioned --input-base "" --input ${PKG}/pkg/apis/tf/v1alpha1 -p ${PKG}/pkg/client/clientset -h ./hack/boilerplate.go.txt
- $(CLIENT_GEN) -n versioned --input-base "" --input ${PKG}/pkg/apis/tf/v1alpha2 -p ${PKG}/pkg/client/clientset -h ./hack/boilerplate.go.txt
+ $(CLIENT_GEN) -n versioned --input-base "" --input ${PKG}/pkg/apis/tf/v1beta1 -p ${PKG}/pkg/client/clientset -h ./hack/boilerplate.go.txt
k8s-gen: crds generate openapi-gen client-gen
@@ -123,10 +121,6 @@ docker-build-job:
docker-push-job:
docker images ${DOCKER_REPO}/tfops --format '{{ .Repository }}:{{ .Tag }}'| grep -v '<none>'|xargs -n1 -t docker push
-GENCERT_VERSION ?= 1.0.2
-release-gencert:
- /bin/bash hack/release-gencert.sh ${GENCERT_VERSION}
-
deploy:
kubectl delete pod --selector name=${DEPLOYMENT} --namespace ${NAMESPACE} && sleep 4
kubectl logs -f --selector name=${DEPLOYMENT} --namespace ${NAMESPACE}
@@ -140,7 +134,7 @@ vet:
go vet ./...
install: crds
- kubectl apply -f deploy/crds/tf.isaaguilar.com_terraforms_crd.yaml
+ kubectl apply -f deploy/crds/tf.galleybytes.com_terraforms_crd.yaml
bundle: crds
/bin/bash hack/bundler.sh ${VERSION}
@@ -162,7 +156,7 @@ push-all: push docker-push-job
# Run against the configured Kubernetes cluster in ~/.kube/config
run: fmt vet
- go run cmd/manager/main.go --max-concurrent-reconciles 10 --disable-conversion-webhook --zap-log-level=5
+ go run cmd/manager/main.go --max-concurrent-reconciles 10 --zap-log-level=5
install-webhook: fmt vet
find deploy -maxdepth 1 -type f -name 'webhook-*' -exec kubectl apply -f {} \;
diff --git a/README.md b/README.md
index 4310dfbb3772385ca1c74b5d27675ade34ec037b..e942535e189518363065a65983332bcbcf6c4af8 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
This project is:
- A way to run Terraform in Kubernetes by defining Terraform deployments as Kubernetes manifests
-- A controller that configures and starts [Terraform Workflows](http://tf.isaaguilar.com/docs/architecture/workflow/) when it sees changes to the Kubernetes manifest
+- A controller that configures and starts [Terraform Workflows](http://tf.galleybytes.com/docs/architecture/workflow/) when it sees changes to the Kubernetes manifest
- Workflow runner pods that execute Terraform plan/apply and other user-defined scripts
This project is not:
@@ -22,21 +22,21 @@ This project is not:
## Installation
-The preferred method is to use helm. See [Install using Helm](http://tf.isaaguilar.com/docs/getting-started/installation/#install-using-helm) on the docs.
+The preferred method is to use helm. See [Install using Helm](http://tf.galleybytes.com/docs/getting-started/installation/#install-using-helm) on the docs.
Another simple method is to install the resources under `deploy` & `deploy/crds`
```bash
-git clone https://github.com/isaaguilar/terraform-operator.git
+git clone https://github.com/galleybytes/terraform-operator.git
cd terraform-operator
kubectl apply -f deploy/bundles/v0.11.0/v0.11.0.yaml
```
-See [more installation options](http://tf.isaaguilar.com/docs/getting-started/installation/).
+See [more installation options](http://tf.galleybytes.com/docs/getting-started/installation/).
## Docs
-Visit [http://tf.isaaguilar.com](http://tf.isaaguilar.com) to read the docs.
+Visit [http://tf.galleybytes.com](http://tf.galleybytes.com) to read the docs.
<p align="center">
<img src="https://s3.amazonaws.com/classic.isaaguilar.com/tfo-workflow-diagramv2.png" alt="Terraform Operator Workflow Diagram"></img>
diff --git a/build/Dockerfile b/build/Dockerfile
index f3103f0c71672423ca0c52438f688936cbf62a5b..c1fcef4cf8cf6bbfbded989510485b76475dff5b 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,5 +1,5 @@
# Build the manager binary
-FROM golang:1.15 as builder
+FROM golang:1.20 as builder
WORKDIR /workspace
# Copy the Go Modules manifests
COPY go.mod go.mod
diff --git a/build/Dockerfile.local b/build/Dockerfile.local
index 9df839b50cdf93b904d8b7d63f19c39c7216b685..e9e47e0658d440fb809a04622017851fadb32adc 100644
--- a/build/Dockerfile.local
+++ b/build/Dockerfile.local
@@ -9,3 +9,4 @@ ENTRYPOINT ["/usr/local/bin/entrypoint"]
USER ${USER_UID}
# install operator binary is the only layer that changes
COPY _output/manager ${OPERATOR}
+LABEL org.opencontainers.image.source https://github.com/galleybytes/terraform-operator
\ No newline at end of file
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 23fa692db82fe1b5c67640a3fb23117d46d36a51..ad4354d98075050ac0059f72a9518c54e59ec807 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -8,9 +8,8 @@ import (
"time"
// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
- "github.com/isaaguilar/terraform-operator/pkg/apis"
- "github.com/isaaguilar/terraform-operator/pkg/controllers"
- "github.com/isaaguilar/terraform-operator/pkg/webhook/admission"
+ "github.com/galleybytes/terraform-operator/pkg/apis"
+ "github.com/galleybytes/terraform-operator/pkg/controllers"
localcache "github.com/patrickmn/go-cache"
"go.uber.org/zap/zapcore"
corev1 "k8s.io/api/core/v1"
@@ -40,7 +39,6 @@ func main() {
var enableLeaderElection bool
var probeAddr string
var maxConcurrentReconciles int
- var disableConversionWebhook bool
var disableReconciler bool
var inheritNodeSelector bool
var inheritAffinty bool
@@ -48,7 +46,6 @@ func main() {
flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
- flag.BoolVar(&disableConversionWebhook, "disable-conversion-webhook", false, "Set to true to disable the conversion webhook")
flag.BoolVar(&disableReconciler, "disable-reconciler", false, "Set to true to disable the reconcile loop controller)")
flag.BoolVar(&enableLeaderElection, "leader-elect", false,
"Enable leader election for controller manager. "+
@@ -87,7 +84,7 @@ func main() {
Port: 9443,
HealthProbeBindAddress: probeAddr,
LeaderElection: enableLeaderElection,
- LeaderElectionID: "050c8fba.isaaguilar.com",
+ LeaderElectionID: "050c8fba.galleybytes.com",
})
if err != nil {
setupLog.Error(err, "unable to start manager")
@@ -133,10 +130,6 @@ func main() {
os.Exit(1)
}
- if !disableConversionWebhook {
- mgr.GetWebhookServer().Register("/conversion", admission.NewConversionWebhook(ctrl.Log.WithName("conversion")))
- }
-
setupLog.Info("starting manager")
if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
setupLog.Error(err, "problem running manager")
diff --git a/deploy/clusterrole.yaml b/deploy/clusterrole.yaml
index 9df5006d3bdb15f5e2c0a48330ca5f64df65364c..bd40dbf0145e9977f49ae67e7371999869e61a8e 100644
--- a/deploy/clusterrole.yaml
+++ b/deploy/clusterrole.yaml
@@ -78,7 +78,7 @@ rules:
- get
- apiGroups:
- - tf.isaaguilar.com
+ - tf.galleybytes.com
resources:
- '*'
verbs:
@@ -89,6 +89,6 @@ rules:
resources:
- customresourcedefinitions
resourceNames:
- - terraforms.tf.isaaguilar.com
+ - terraforms.tf.galleybytes.com
verbs:
- - '*'
\ No newline at end of file
+ - '*'
diff --git a/deploy/crds/tf.isaaguilar.com_terraforms_crd.yaml b/deploy/crds/tf.galleybytes.com_terraforms_crd.yaml
similarity index 56%
rename from deploy/crds/tf.isaaguilar.com_terraforms_crd.yaml
rename to deploy/crds/tf.galleybytes.com_terraforms_crd.yaml
index 6309a738a5b8757b442fe2d3f5e2b1e2223301c7..e9a061aad0cdda32d4a9b1a9867052f6ce8d9517 100644
--- a/deploy/crds/tf.isaaguilar.com_terraforms_crd.yaml
+++ b/deploy/crds/tf.galleybytes.com_terraforms_crd.yaml
@@ -3,11 +3,10 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
- controller-gen.kubebuilder.io/version: v0.9.2
- creationTimestamp: null
- name: terraforms.tf.isaaguilar.com
+ controller-gen.kubebuilder.io/version: v0.12.0
+ name: terraforms.tf.galleybytes.com
spec:
- group: tf.isaaguilar.com
+ group: tf.galleybytes.com
names:
kind: Terraform
listKind: TerraformList
@@ -21,717 +20,7 @@ spec:
- jsonPath: .metadata.creationTimestamp
name: Age
type: date
- deprecated: true
- deprecationWarning: tf.isaaguilar.com/v1alpha1 is no longer supported. Please
- upgrade to tf.isaaguilar.com/v1alpha2
- name: v1alpha1
- schema:
- openAPIV3Schema:
- description: Terraform is the Schema for the terraforms API
- properties:
- apiVersion:
- description: 'APIVersion defines the versioned schema of this representation
- of an object. Servers should convert recognized schemas to the latest
- internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
- type: string
- kind:
- description: 'Kind is a string value representing the REST resource this
- object represents. Servers may infer this from the endpoint the client
- submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
- type: string
- metadata:
- type: object
- spec:
- description: TerraformSpec defines the desired state of Terraform
- properties:
- cleanupDisk:
- description: CleanupDisk will clear out previous terraform run data
- from the persistent volume.
- type: boolean
- credentials:
- description: Credentials is an array of credentials generally used
- for Terraform providers
- items:
- description: Credentials are used for adding credentials for terraform
- providers. For example, in AWS, the AWS Terraform Provider uses
- the default credential chain of the AWS SDK, one of which are
- environment variables (eg AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY)
- properties:
- aws:
- description: AWSCredentials contains the different methods to
- load AWS credentials for the Terraform AWS Provider. If using
- AWS_ACCESS_KEY_ID and/or environment variables for credentials,
- use fromEnvs.
- properties:
- irsa:
- description: "IRSA requires the irsa role-arn as the string
- input. This will create a serice account named tf-<resource-name>.
- In order for the pod to be able to use this role, the
- \"Trusted Entity\" of the IAM role must allow this serice
- account name and namespace. \n Using a TrustEntity policy
- that includes \"StringEquals\" setting it as the serivce
- account name is the most secure way to use IRSA. \n However,
- for a reusable policy consider \"StringLike\" with a few
- wildcards to make the irsa role usable by pods created
- by terraform-operator. The example below is pretty liberal,
- but will work for any pod created by the terraform-operator.
- \n { \"Version\": \"2012-10-17\", \"Statement\": [ { \"Effect\":
- \"Allow\", \"Principal\": { \"Federated\": \"${OIDC_ARN}\"
- }, \"Action\": \"sts:AssumeRoleWithWebIdentity\", \"Condition\":
- { \"StringLike\": { \"${OIDC_URL}:sub\": \"system:serviceaccount:*:tf-*\"
- } } } ] }"
- type: string
- kiam:
- description: KIAM requires the kiam role-name as the string
- input. This will add the correct annotation to the terraform
- execution pod
- type: string
- type: object
- secretNameRef:
- description: SecretNameRef will load environment variables into
- the terraform runner from a kubernetes secret
- properties:
- key:
- description: Key of the secret
- type: string
- name:
- description: Name of the secret
- type: string
- namespace:
- description: Namespace of the secret; Defaults to namespace
- of the tf resource
- type: string
- required:
- - name
- type: object
- serviceAccountAnnotations:
- additionalProperties:
- type: string
- description: ServiceAccountAnnotations allows the service account
- to be annotated with cloud IAM roles such as Workload Identity
- on GCP
- type: object
- type: object
- type: array
- customBackend:
- description: CustomBackend will allow the user to configure the backend
- of their choice. If this is omitted, the default consul template
- will be used.
- type: string
- env:
- description: Env is used to define a common set of environment variables
- into the workflow runners. The `TF_VAR_` prefix will also be used
- by the `exportRepo` option.
- items:
- description: EnvVar represents an environment variable present in
- a Container.
- properties:
- name:
- description: Name of the environment variable. Must be a C_IDENTIFIER.
- type: string
- value:
- description: 'Variable references $(VAR_NAME) are expanded using
- the previous defined environment variables in the container
- and any service environment variables. If a variable cannot
- be resolved, the reference in the input string will be unchanged.
- The $(VAR_NAME) syntax can be escaped with a double $$, ie:
- $$(VAR_NAME). Escaped references will never be expanded, regardless
- of whether the variable exists or not. Defaults to "".'
- type: string
- valueFrom:
- description: Source for the environment variable's value. Cannot
- be used if value is not empty.
- properties:
- configMapKeyRef:
- description: Selects a key of a ConfigMap.
- properties:
- key:
- description: The key to select.
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?'
- type: string
- optional:
- description: Specify whether the ConfigMap or its key
- must be defined
- type: boolean
- required:
- - key
- type: object
- fieldRef:
- description: 'Selects a field of the pod: supports metadata.name,
- metadata.namespace, `metadata.labels[''<KEY>'']`, `metadata.annotations[''<KEY>'']`,
- spec.nodeName, spec.serviceAccountName, status.hostIP,
- status.podIP, status.podIPs.'
- properties:
- apiVersion:
- description: Version of the schema the FieldPath is
- written in terms of, defaults to "v1".
- type: string
- fieldPath:
- description: Path of the field to select in the specified
- API version.
- type: string
- required:
- - fieldPath
- type: object
- resourceFieldRef:
- description: 'Selects a resource of the container: only
- resources limits and requests (limits.cpu, limits.memory,
- limits.ephemeral-storage, requests.cpu, requests.memory
- and requests.ephemeral-storage) are currently supported.'
- properties:
- containerName:
- description: 'Container name: required for volumes,
- optional for env vars'
- type: string
- divisor:
- anyOf:
- - type: integer
- - type: string
- description: Specifies the output format of the exposed
- resources, defaults to "1"
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- resource:
- description: 'Required: resource to select'
- type: string
- required:
- - resource
- type: object
- secretKeyRef:
- description: Selects a key of a secret in the pod's namespace
- properties:
- key:
- description: The key of the secret to select from. Must
- be a valid secret key.
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?'
- type: string
- optional:
- description: Specify whether the Secret or its key must
- be defined
- type: boolean
- required:
- - key
- type: object
- type: object
- required:
- - name
- type: object
- type: array
- exportRepo:
- description: ExportRepo allows the user to define
- properties:
- address:
- description: Address is the git repo to save to. At this time,
- only SSH is allowed
- type: string
- confFile:
- description: ConfFile is the full path relative to the root of
- the repo
- type: string
- gitEmail:
- description: GitEmail is the email of the user who pushes to git.
- This email is typically an automation user and probably the
- user whose token or sshkey is configured in scmAuthMethod
- type: string
- gitUsername:
- description: GitUsername is the name of the user who pushes to
- git. This name is typically an automation user and probably
- the user whose token or sshkey is configured in scmAuthMethod
- type: string
- retryOnFailure:
- description: RetryOnFailure sets the export pod's restartPolicy
- to "OnFailure"
- type: boolean
- tfvarsFile:
- description: TFVarsFile is the full path relative to the root
- of the repo
- type: string
- required:
- - address
- type: object
- ignoreDelete:
- description: IgnoreDelete will bypass the finalization process and
- remove the tf resource without running any delete jobs.
- type: boolean
- keepCompletedPods:
- description: KeepCompletedPods when true will keep completed pods.
- Default is false and completed pods are removed.
- type: boolean
- keepLatestPodsOnly:
- description: KeepLatestPodsOnly when true will keep only the pods
- that match the current generation of the terraform k8s-resource.
- This overrides the behavior of `keepCompletedPods`.
- type: boolean
- outputsSecret:
- description: OutputsSecret will create a secret with the outputs from
- the module. All outputs from the module will be written to the secret
- unless the user defines "outputsToInclude" or "outputsToOmit".
- type: string
- outputsToInclude:
- description: OutputsToInclude is a whitelist of outputs to write when
- writing the outputs to kubernetes.
- items:
- type: string
- type: array
- outputsToOmit:
- description: OutputsToOmit is a blacklist of outputs to omit when
- writing the outputs to kubernetes.
- items:
- type: string
- type: array
- persistentVolumeSize:
- anyOf:
- - type: integer
- - type: string
- description: PersistentVolumeSize define the size of the disk used
- to store terraform run data. If not defined, a default of "2Gi"
- is used.
- pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
- x-kubernetes-int-or-string: true
- postApplyDeleteScript:
- type: string
- postApplyScript:
- description: "PostApplyScript lets the user define a script that will
- run after terraform commands are executed on the terraform-execution
- pod. The pod will have already set up cloudProfile (eg cloud credentials)
- so the script can make use of it. \n Setting this field will create
- a key in the tfvars configmap called \"postrun.sh\". This means
- the user can alternatively pass in a posterun.sh file via config
- \"Sources\"."
- type: string
- postInitDeleteScript:
- type: string
- postInitScript:
- type: string
- postPlanDeleteScript:
- type: string
- postPlanScript:
- type: string
- preApplyDeleteScript:
- type: string
- preApplyScript:
- type: string
- preInitDeleteScript:
- type: string
- preInitScript:
- description: "PreInitScript lets the user define a script that will
- run before terraform commands are executed on the terraform-execution
- pod. The pod will have already set up cloudProfile (eg cloud credentials)
- so the script can make use of it. \n Setting this field will create
- a key in the tfvars configmap called \"prerun.sh\". This means the
- user can also pass in a prerun.sh file via config \"Sources\"."
- type: string
- prePlanDeleteScript:
- type: string
- prePlanScript:
- type: string
- reconcile:
- description: Reconcile are the settings used for auto-reconciliation
- properties:
- enable:
- description: Enable used to turn on the auto reconciliation of
- tfstate to actual provisions. Default to false
- type: boolean
- syncPeriod:
- description: SyncPeriod can be used to set a custom time to check
- actual provisions to tfstate. Defaults to 60 minutes
- format: int64
- type: integer
- required:
- - enable
- type: object
- resourceDownloads:
- description: ResourceDownloads defines other files to download into
- the module directory that can be used by the terraform workflow
- runners. The `tfvar` type will also be fetched by the `exportRepo`
- option (if defined) to aggregate the set of tfvars to save to an
- scm system.
- items:
- description: 'ResourceDownload (formerly SrcOpts) defines a resource
- to fetch using one of the configured protocols: ssh|http|https
- (eg git::SSH or git::HTTPS)'
- properties:
- address:
- description: Address defines the source address resources to
- fetch.
- type: string
- path:
- description: Path will download the resources into this path
- which is relative to the main module directory.
- type: string
- useAsVar:
- description: UseAsVar will add the file as a tfvar via the -var-file
- flag of the terraform plan command. The downloaded resource
- must not be a directory.
- type: boolean
- required:
- - address
- type: object
- type: array
- runnerAnnotations:
- additionalProperties:
- type: string
- description: RunnerAnnotations are annotations that will be added
- to all runner pods.
- type: object
- runnerLabels:
- additionalProperties:
- type: string
- description: RunnerLabels key/value pairs that will be added as labels
- to runner pods
- type: object
- runnerRules:
- description: RunnerRules are RBAC rules that will be added to all
- runner pods.
- items:
- description: PolicyRule holds information that describes a policy
- rule, but does not contain information about who the rule applies
- to or which namespace the rule applies to.
- properties:
- apiGroups:
- description: APIGroups is the name of the APIGroup that contains
- the resources. If multiple API groups are specified, any
- action requested against one of the enumerated resources in
- any API group will be allowed.
- items:
- type: string
- type: array
- nonResourceURLs:
- description: NonResourceURLs is a set of partial urls that a
- user should have access to. *s are allowed, but only as the
- full, final step in the path Since non-resource URLs are not
- namespaced, this field is only applicable for ClusterRoles
- referenced from a ClusterRoleBinding. Rules can either apply
- to API resources (such as "pods" or "secrets") or non-resource
- URL paths (such as "/api"), but not both.
- items:
- type: string
- type: array
- resourceNames:
- description: ResourceNames is an optional white list of names
- that the rule applies to. An empty set means that everything
- is allowed.
- items:
- type: string
- type: array
- resources:
- description: Resources is a list of resources this rule applies
- to. ResourceAll represents all resources.
- items:
- type: string
- type: array
- verbs:
- description: Verbs is a list of Verbs that apply to ALL the
- ResourceKinds and AttributeRestrictions contained in this
- rule. VerbAll represents all kinds.
- items:
- type: string
- type: array
- required:
- - verbs
- type: object
- type: array
- scmAuthMethods:
- description: SCMAuthMethods define multiple SCMs that require tokens/keys
- items:
- description: SCMAuthMethod definition of SCMs that require tokens/keys
- properties:
- git:
- description: Git configuration options for auth methods of git
- properties:
- https:
- description: GitHTTPS configures the setup for git over
- https using tokens. Proxy is not supported in the terraform
- job pod at this moment TODO HTTPS Proxy support
- properties:
- requireProxy:
- type: boolean
- tokenSecretRef:
- description: TokenSecretRef defines the token or password
- that can be used to log into a system (eg git)
- properties:
- key:
- description: Key in the secret ref. Default to `token`
- type: string
- name:
- description: Name the secret name that has the token
- or password
- type: string
- namespace:
- description: Namespace of the secret; Default is
- the namespace of the terraform resource
- type: string
- required:
- - name
- type: object
- required:
- - tokenSecretRef
- type: object
- ssh:
- description: GitSSH configurs the setup for git over ssh
- with optional proxy
- properties:
- requireProxy:
- type: boolean
- sshKeySecretRef:
- description: SSHKeySecretRef defines the secret where
- the SSH key (for the proxy, git, etc) is stored
- properties:
- key:
- description: Key in the secret ref. Default to `id_rsa`
- type: string
- name:
- description: Name the secret name that has the SSH
- key
- type: string
- namespace:
- description: Namespace of the secret; Default is
- the namespace of the terraform resource
- type: string
- required:
- - name
- type: object
- required:
- - sshKeySecretRef
- type: object
- type: object
- host:
- type: string
- required:
- - host
- type: object
- type: array
- scriptRunner:
- type: string
- scriptRunnerExecutionScriptConfigMap:
- description: ScriptRunnerExecutionScriptConfigMap allows the user
- to define a custom terraform runner script that gets executed instead
- of the default script built into the runner image. The configmap
- "name" and "key" are required.
- properties:
- key:
- description: The key to select.
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?'
- type: string
- optional:
- description: Specify whether the ConfigMap or its key must be
- defined
- type: boolean
- required:
- - key
- type: object
- scriptRunnerPullPolicy:
- description: PullPolicy describes a policy for if/when to pull a container
- image
- type: string
- scriptRunnerVersion:
- type: string
- serviceAccount:
- description: ServiceAccount use a specific kubernetes ServiceAccount
- for running the create + destroy pods. If not specified we create
- a new ServiceAccount per Terraform
- type: string
- setupRunner:
- type: string
- setupRunnerExecutionScriptConfigMap:
- description: SetupRunnerExecutionScriptConfigMap allows the user to
- define a custom terraform runner script that gets executed instead
- of the default script built into the runner image. The configmap
- "name" and "key" are required.
- properties:
- key:
- description: The key to select.
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?'
- type: string
- optional:
- description: Specify whether the ConfigMap or its key must be
- defined
- type: boolean
- required:
- - key
- type: object
- setupRunnerPullPolicy:
- description: PullPolicy describes a policy for if/when to pull a container
- image
- type: string
- setupRunnerVersion:
- type: string
- sshTunnel:
- description: SSHTunnel can be defined for pulling from scm sources
- that cannot be accessed by the network the operator/runner runs
- in. An example is Enterprise Github servers running on a private
- network.
- properties:
- host:
- type: string
- sshKeySecretRef:
- description: SSHKeySecretRef defines the secret where the SSH
- key (for the proxy, git, etc) is stored
- properties:
- key:
- description: Key in the secret ref. Default to `id_rsa`
- type: string
- name:
- description: Name the secret name that has the SSH key
- type: string
- namespace:
- description: Namespace of the secret; Default is the namespace
- of the terraform resource
- type: string
- required:
- - name
- type: object
- user:
- type: string
- required:
- - sshKeySecretRef
- type: object
- terraformModule:
- description: "TerraformModule is the terraform module scm address.
- Currently supports git protocol over SSH or HTTPS. \n Precedence
- of \"terraformModule*\" to use as the main module is determined
- by the setup runner. See the runners/setup.sh for the module configuration."
- type: string
- terraformModuleConfigMap:
- description: TerraformModuleConfigMap is the configMap that contains
- terraform module resources. The module will be fetched by the setup
- runner. In order for terraform to understand it's a module reosurce,
- the configmap keys must end in `.tf` or `.tf.json`.
- properties:
- key:
- type: string
- name:
- type: string
- required:
- - name
- type: object
- terraformModuleInline:
- description: TerraformModuleInline is an incline terraform module
- definition. The contents of the inline definition will be used to
- create `inline-module.tf`
- type: string
- terraformRunner:
- description: TerraformRunner gives the user the ability to inject
- their own container image to execute terraform. This is very helpful
- for users who need to have a certain toolset installed on their
- images, or who can't pull public images, such as the default image
- "isaaguilar/tfops".
- type: string
- terraformRunnerExecutionScriptConfigMap:
- description: TerraformRunnerExecutionScriptConfigMap allows the user
- to define a custom terraform runner script that gets executed instead
- of the default script built into the runner image. The configmap
- "name" and "key" are required.
- properties:
- key:
- description: The key to select.
- type: string
- name:
- description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
- TODO: Add other useful fields. apiVersion, kind, uid?'
- type: string
- optional:
- description: Specify whether the ConfigMap or its key must be
- defined
- type: boolean
- required:
- - key
- type: object
- terraformRunnerPullPolicy:
- description: TerraformRunnerPullPolicy describes a policy for if/when
- to pull the TerraformRunner image. Acceptable values are "Always",
- "Never", or "IfNotPresent".
- type: string
- terraformVersion:
- description: TerraformVersion helps the operator decide which image
- tag to pull for the terraform runner. Defaults to "0.11.14"
- type: string
- writeOutputsToStatus:
- description: WriteOutputsToStatus will add the outputs from the module
- to the status of the Terraform CustomResource.
- type: boolean
- type: object
- status:
- description: TerraformStatus defines the observed state of Terraform
- properties:
- exported:
- type: string
- lastCompletedGeneration:
- format: int64
- type: integer
- outputs:
- additionalProperties:
- type: string
- type: object
- phase:
- type: string
- podNamePrefix:
- description: PodNamePrefix is used to identify this installation of
- the resource. For very long resource names, like those greater than
- 220 characters, the prefix ensures resource uniqueness for runners
- and other resources used by the runner. Another case for the pod
- name prefix is when rapidly deleteing a resource and recreating
- it, the chance of recycling existing resources is reduced to virtually
- nil.
- type: string
- stages:
- items:
- properties:
- generation:
- format: int64
- type: integer
- interruptible:
- description: Interruptible is set to false when the pod should
- not be terminated such as when doing a terraform apply
- type: boolean
- podType:
- type: string
- reason:
- type: string
- startTime:
- format: date-time
- type: string
- state:
- type: string
- stopTime:
- format: date-time
- type: string
- required:
- - generation
- - interruptible
- - podType
- - reason
- - state
- type: object
- type: array
- required:
- - lastCompletedGeneration
- - phase
- - podNamePrefix
- - stages
- type: object
- type: object
- served: true
- storage: false
- subresources:
- status: {}
- - additionalPrinterColumns:
- - jsonPath: .metadata.creationTimestamp
- name: Age
- type: date
- name: v1alpha2
+ name: v1beta1
schema:
openAPIV3Schema:
description: Terraform is the Schema for the terraforms API
@@ -1149,13 +438,15 @@ spec:
type: string
value:
description: 'Variable references $(VAR_NAME) are expanded
- using the previous defined environment variables in
+ using the previously defined environment variables in
the container and any service environment variables.
If a variable cannot be resolved, the reference in the
- input string will be unchanged. The $(VAR_NAME) syntax
- can be escaped with a double $$, ie: $$(VAR_NAME). Escaped
- references will never be expanded, regardless of whether
- the variable exists or not. Defaults to "".'
+ input string will be unchanged. Double $$ are reduced
+ to a single $, which allows for escaping the $(VAR_NAME)
+ syntax: i.e. "$$(VAR_NAME)" will produce the string
+ literal "$(VAR_NAME)". Escaped references will never
+ be expanded, regardless of whether the variable exists
+ or not. Defaults to "".'
type: string
valueFrom:
description: Source for the environment variable's value.
@@ -1180,6 +471,7 @@ spec:
required:
- key
type: object
+ x-kubernetes-map-type: atomic
fieldRef:
description: 'Selects a field of the pod: supports
metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`,
@@ -1198,6 +490,7 @@ spec:
required:
- fieldPath
type: object
+ x-kubernetes-map-type: atomic
resourceFieldRef:
description: 'Selects a resource of the container:
only resources limits and requests (limits.cpu,
@@ -1223,6 +516,7 @@ spec:
required:
- resource
type: object
+ x-kubernetes-map-type: atomic
secretKeyRef:
description: Selects a key of a secret in the pod's
namespace
@@ -1244,6 +538,7 @@ spec:
required:
- key
type: object
+ x-kubernetes-map-type: atomic
type: object
required:
- name
@@ -1274,6 +569,7 @@ spec:
defined
type: boolean
type: object
+ x-kubernetes-map-type: atomic
prefix:
description: An optional identifier to prepend to each
key in the ConfigMap. Must be a C_IDENTIFIER.
@@ -1290,6 +586,7 @@ spec:
description: Specify whether the Secret must be defined
type: boolean
type: object
+ x-kubernetes-map-type: atomic
type: object
type: array
for:
@@ -1316,7 +613,8 @@ spec:
description: APIGroups is the name of the APIGroup that
contains the resources. If multiple API groups are
specified, any action requested against one of the enumerated
- resources in any API group will be allowed.
+ resources in any API group will be allowed. "" represents
+ the core API group and "*" represents all API groups.
items:
type: string
type: array
@@ -1341,14 +639,14 @@ spec:
type: array
resources:
description: Resources is a list of resources this rule
- applies to. ResourceAll represents all resources.
+ applies to. '*' represents all resources.
items:
type: string
type: array
verbs:
description: Verbs is a list of Verbs that apply to ALL
- the ResourceKinds and AttributeRestrictions contained
- in this rule. VerbAll represents all kinds.
+ the ResourceKinds contained in this rule. '*' represents
+ all verbs.
items:
type: string
type: array
@@ -1359,6 +657,28 @@ spec:
resources:
description: Compute Resources required by the task pods.
properties:
+ claims:
+ description: "Claims lists the names of resources, defined
+ in spec.resourceClaims, that are used by this container.
+ \n This is an alpha field and requires enabling the DynamicResourceAllocation
+ feature gate. \n This field is immutable. It can only
+ be set for containers."
+ items:
+ description: ResourceClaim references one entry in PodSpec.ResourceClaims.
+ properties:
+ name:
+ description: Name must match the name of one entry
+ in pod.spec.resourceClaims of the Pod where this
+ field is used. It makes that resource available
+ inside a container.
+ type: string
+ required:
+ - name
+ type: object
+ type: array
+ x-kubernetes-list-map-keys:
+ - name
+ x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
@@ -1367,7 +687,7 @@ spec:
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Limits describes the maximum amount of compute
- resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+ resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
requests:
additionalProperties:
@@ -1379,8 +699,8 @@ spec:
description: 'Requests describes the minimum amount of compute
resources required. If Requests is omitted for a container,
it defaults to Limits if that is explicitly specified,
- otherwise to an implementation-defined value. More info:
- https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+ otherwise to an implementation-defined value. Requests
+ cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
restartPolicy:
diff --git a/deploy/deployment.yaml b/deploy/deployment.yaml
index 1b1b96ba97e513f82e83fb8f7d6e0416c3e27bc3..fe5c32d3b88eb960fe279a688c6552caefc19738 100644
--- a/deploy/deployment.yaml
+++ b/deploy/deployment.yaml
@@ -26,14 +26,13 @@ spec:
runAsUser: 1001
containers:
- name: terraform-operator
- image: "isaaguilar/terraform-operator:latest"
+ image: "ghcr.io/galleybytes/terraform-operator:latest"
imagePullPolicy: IfNotPresent
command:
- terraform-operator
args:
- --zap-log-level=debug
- --zap-encoder=console
- - --disable-conversion-webhook
env:
- name: WATCH_NAMESPACE # Leave blank to watch all namespaces
- name: POD_NAME
diff --git a/deploy/webhook-clusterrole.yaml b/deploy/webhook-clusterrole.yaml
deleted file mode 100644
index 7cfa03854b1fdb1f1de0d36543b1bbc6e23cc273..0000000000000000000000000000000000000000
--- a/deploy/webhook-clusterrole.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
- name: terraform-operator-webhook
-rules:
-- apiGroups:
- - ""
- resources:
- - secrets
- verbs:
- - get
- - create
- - update
-
-- apiGroups:
- - ""
- resources:
- - pods
- verbs:
- - get
- - watch
- - list
-
-- apiGroups:
- - apiextensions.k8s.io
- resources:
- - customresourcedefinitions
- resourceNames:
- - terraforms.tf.isaaguilar.com
- verbs:
- - '*'
\ No newline at end of file
diff --git a/deploy/webhook-clusterrolebinding.yaml b/deploy/webhook-clusterrolebinding.yaml
deleted file mode 100644
index 74f7e3ab20536c6e833f553a3b686eaba11a4959..0000000000000000000000000000000000000000
--- a/deploy/webhook-clusterrolebinding.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-kind: ClusterRoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
- name: terraform-operator-webhook
-subjects:
-- kind: ServiceAccount
- name: terraform-operator-webhook
- namespace: tf-system
-roleRef:
- kind: ClusterRole
- name: terraform-operator-webhook
- apiGroup: rbac.authorization.k8s.io
\ No newline at end of file
diff --git a/deploy/webhook-deployment.yaml b/deploy/webhook-deployment.yaml
deleted file mode 100644
index ac9d04bd2c5024d08335a0ea70996d4b618c9a01..0000000000000000000000000000000000000000
--- a/deploy/webhook-deployment.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: terraform-operator-webhook
- namespace: tf-system
-spec:
- replicas: 2
- strategy:
- type: RollingUpdate
- rollingUpdate:
- maxSurge: 25%
- maxUnavailable: 25%
- selector:
- matchLabels:
- app: terraform-operator
- component: webhook
- template:
- metadata:
- labels:
- app: terraform-operator
- component: webhook
- spec:
- serviceAccountName: terraform-operator-webhook
- securityContext:
- runAsNonRoot: true
- runAsUser: 1001
- initContainers:
- - name: gencert
- image: "ghcr.io/galleybytes/terraform-operator-gencert:1.0.2"
- imagePullPolicy: IfNotPresent
- env:
- - name: SERVICE
- value: terraform-operator-webhook
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- apiVersion: v1
- fieldPath: metadata.namespace
- - name: SECRET
- value: terraform-operator-selfsigned
- containers:
- - name: terraform-operator
- image: "isaaguilar/terraform-operator:latest"
- imagePullPolicy: IfNotPresent
- command:
- - terraform-operator
- args:
- - --zap-log-level=debug
- - --zap-encoder=console
- - --disable-reconciler
- env:
- - name: WATCH_NAMESPACE # Leave blank to watch all namespaces
- - name: POD_NAME
- valueFrom:
- fieldRef:
- apiVersion: v1
- fieldPath: metadata.name
- - name: OPERATOR_NAME
- value: terraform-operator
- resources:
- limits:
- cpu: 50m
- memory: 128M
- requests:
- cpu: 25m
- memory: 128M
- ports:
- - name: https
- containerPort: 9443
- protocol: TCP
- volumeMounts:
- - name: certs
- mountPath: /tmp/k8s-webhook-server/serving-certs
- readOnly: true
- volumes:
- - name: certs
- secret:
- secretName: terraform-operator-selfsigned
- optional: true
diff --git a/deploy/webhook-service.yaml b/deploy/webhook-service.yaml
deleted file mode 100644
index 914756ae751282a3204d6dcd1b3447cc22bb2b4e..0000000000000000000000000000000000000000
--- a/deploy/webhook-service.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: terraform-operator-webhook
- namespace: tf-system
-spec:
- ports:
- - name: https
- port: 443
- protocol: TCP
- targetPort: 9443
- selector:
- app: terraform-operator
- component: webhook
- sessionAffinity: None
- type: ClusterIP
\ No newline at end of file
diff --git a/deploy/webhook-serviceaccount.yaml b/deploy/webhook-serviceaccount.yaml
deleted file mode 100644
index a13732f1c8d0c862200713bed42b147c6b4a942b..0000000000000000000000000000000000000000
--- a/deploy/webhook-serviceaccount.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- name: terraform-operator-webhook
- namespace: tf-system
diff --git a/examples/monitor-plugin.yaml b/examples/monitor-plugin.yaml
index f8d25950d4d2e1ee2f87610949144367508d9c99..06cb0f31b8752d4a3232805a3f2ac1d4f8ba3df7 100644
--- a/examples/monitor-plugin.yaml
+++ b/examples/monitor-plugin.yaml
@@ -1,4 +1,4 @@
-apiVersion: tf.isaaguilar.com/v1alpha2
+apiVersion: tf.galleybytes.com/v1beta1
kind: Terraform
metadata:
name: monitor-plugin-example
@@ -23,7 +23,7 @@ spec:
plugins:
monitor:
- image: isaaguilar/tfomonitor:latest
+ image: ghcr.io/galleybytes/tfomonitor:latest
imagePullPolicy: IfNotPresent
when: After
task: setup
diff --git a/examples/simple-template.yaml b/examples/simple-template.yaml
index 7245deb1151ff4c71ea2442ef69d090f729d0c5e..79fcebf0a2d8c4d37ca47ef5b5621bc2feef2239 100644
--- a/examples/simple-template.yaml
+++ b/examples/simple-template.yaml
@@ -1,4 +1,4 @@
-apiVersion: tf.isaaguilar.com/v1alpha2
+apiVersion: tf.galleybytes.com/v1beta1
kind: Terraform
metadata:
name: simple-template-example
diff --git a/go.mod b/go.mod
index 145f4669715454ea50e634386a4fc3339375fd39..72eee355b250d96738461c896563310aa4b56fb7 100644
--- a/go.mod
+++ b/go.mod
@@ -1,128 +1,116 @@
-module github.com/isaaguilar/terraform-operator
-
-replace (
- google.golang.org/grpc => google.golang.org/grpc v1.29.1
- k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.6.0
- sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.1.11-0.20190411181648-9d55346c2bde
-)
+module github.com/galleybytes/terraform-operator
replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20190924102528-32369d4db2ad // Required until https://github.com/operator-framework/operator-lifecycle-manager/pull/1241 is resolved
-go 1.19
+go 1.20
require (
- github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
- github.com/go-logr/logr v0.3.0
- github.com/go-openapi/jsonreference v0.19.3
- github.com/hashicorp/go-getter v1.5.2
- github.com/isaaguilar/selfsigned v1.0.0
- github.com/onsi/ginkgo v1.14.1
- github.com/onsi/gomega v1.10.2
+ github.com/MakeNowJust/heredoc v1.0.0
+ github.com/go-logr/logr v1.2.4
+ github.com/go-openapi/jsonreference v0.20.2
+ github.com/hashicorp/go-getter v1.7.1
+ github.com/isaaguilar/selfsigned v1.1.0
github.com/patrickmn/go-cache v2.1.0+incompatible
- go.uber.org/zap v1.15.0
- golang.org/x/crypto v0.6.0
+ go.uber.org/zap v1.24.0
+ golang.org/x/crypto v0.9.0
gopkg.in/src-d/go-git.v4 v4.13.1
- k8s.io/api v0.20.1
- k8s.io/apiextensions-apiserver v0.20.1
- k8s.io/apimachinery v0.20.2
- k8s.io/client-go v0.20.1
- k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf
- sigs.k8s.io/controller-runtime v0.8.0
+ k8s.io/api v0.27.2
+ k8s.io/apiextensions-apiserver v0.27.2
+ k8s.io/apimachinery v0.27.2
+ k8s.io/client-go v0.27.2
+ k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
+ sigs.k8s.io/controller-runtime v0.15.0
)
require (
- cloud.google.com/go v0.54.0 // indirect
- cloud.google.com/go/storage v1.6.0 // indirect
- github.com/Azure/go-autorest v14.2.0+incompatible // indirect
- github.com/Azure/go-autorest/autorest v0.11.1 // indirect
- github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
- github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
- github.com/Azure/go-autorest/logger v0.2.1 // indirect
- github.com/Azure/go-autorest/tracing v0.6.0 // indirect
- github.com/BurntSushi/toml v0.3.1 // indirect
- github.com/PuerkitoBio/purell v1.1.1 // indirect
- github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
- github.com/aws/aws-sdk-go v1.27.0 // indirect
+ cloud.google.com/go v0.110.2 // indirect
+ cloud.google.com/go/compute v1.20.0 // indirect
+ cloud.google.com/go/compute/metadata v0.2.3 // indirect
+ cloud.google.com/go/iam v1.1.0 // indirect
+ cloud.google.com/go/storage v1.30.1 // indirect
+ github.com/Microsoft/go-winio v0.6.1 // indirect
+ github.com/aws/aws-sdk-go v1.44.278 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
+ github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/emicklei/go-restful v2.9.5+incompatible // indirect
- github.com/emirpasic/gods v1.12.0 // indirect
- github.com/evanphx/json-patch v4.9.0+incompatible // indirect
- github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
- github.com/fsnotify/fsnotify v1.4.9 // indirect
- github.com/go-logr/zapr v0.2.0 // indirect
- github.com/go-openapi/jsonpointer v0.19.5 // indirect
- github.com/go-openapi/swag v0.19.5 // indirect
- github.com/gogo/protobuf v1.3.1 // indirect
- github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
- github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
- github.com/golang/protobuf v1.5.2 // indirect
- github.com/google/go-cmp v0.5.5 // indirect
- github.com/google/gofuzz v1.1.0 // indirect
- github.com/google/uuid v1.1.2 // indirect
- github.com/googleapis/gax-go/v2 v2.0.5 // indirect
- github.com/googleapis/gnostic v0.5.1 // indirect
- github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
+ github.com/emicklei/go-restful/v3 v3.10.2 // indirect
+ github.com/emirpasic/gods v1.18.1 // indirect
+ github.com/evanphx/json-patch v5.6.0+incompatible // indirect
+ github.com/evanphx/json-patch/v5 v5.6.0 // indirect
+ github.com/fsnotify/fsnotify v1.6.0 // indirect
+ github.com/go-logr/zapr v1.2.4 // indirect
+ github.com/go-openapi/jsonpointer v0.19.6 // indirect
+ github.com/go-openapi/swag v0.22.3 // indirect
+ github.com/gogo/protobuf v1.3.2 // indirect
+ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+ github.com/golang/protobuf v1.5.3 // indirect
+ github.com/google/gnostic v0.6.9 // indirect
+ github.com/google/go-cmp v0.5.9 // indirect
+ github.com/google/gofuzz v1.2.0 // indirect
+ github.com/google/s2a-go v0.1.4 // indirect
+ github.com/google/uuid v1.3.0 // indirect
+ github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
+ github.com/googleapis/gax-go/v2 v2.10.0 // indirect
+ github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-safetemp v1.0.0 // indirect
- github.com/hashicorp/go-version v1.2.0 // indirect
- github.com/hashicorp/golang-lru v0.5.4 // indirect
- github.com/imdario/mergo v0.3.10 // indirect
+ github.com/hashicorp/go-version v1.6.0 // indirect
+ github.com/imdario/mergo v0.3.16 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
- github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af // indirect
- github.com/json-iterator/go v1.1.10 // indirect
- github.com/jstemmer/go-junit-report v0.9.1 // indirect
- github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
- github.com/klauspost/compress v1.11.2 // indirect
- github.com/mailru/easyjson v0.7.0 // indirect
- github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
+ github.com/jmespath/go-jmespath v0.4.0 // indirect
+ github.com/josharian/intern v1.0.0 // indirect
+ github.com/json-iterator/go v1.1.12 // indirect
+ github.com/kevinburke/ssh_config v1.2.0 // indirect
+ github.com/klauspost/compress v1.16.5 // indirect
+ github.com/mailru/easyjson v0.7.7 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
- github.com/mitchellh/go-testing-interface v1.0.0 // indirect
+ github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
- github.com/modern-go/reflect2 v1.0.1 // indirect
- github.com/nxadm/tail v1.4.4 // indirect
+ github.com/modern-go/reflect2 v1.0.2 // indirect
+ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
- github.com/prometheus/client_golang v1.7.1 // indirect
- github.com/prometheus/client_model v0.2.0 // indirect
- github.com/prometheus/common v0.10.0 // indirect
- github.com/prometheus/procfs v0.2.0 // indirect
- github.com/sergi/go-diff v1.0.0 // indirect
+ github.com/prometheus/client_golang v1.15.1 // indirect
+ github.com/prometheus/client_model v0.4.0 // indirect
+ github.com/prometheus/common v0.44.0 // indirect
+ github.com/prometheus/procfs v0.10.1 // indirect
+ github.com/sergi/go-diff v1.3.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/src-d/gcfg v1.4.0 // indirect
- github.com/ulikunitz/xz v0.5.8 // indirect
- github.com/xanzy/ssh-agent v0.2.1 // indirect
- go.opencensus.io v0.22.3 // indirect
- go.uber.org/atomic v1.6.0 // indirect
- go.uber.org/multierr v1.5.0 // indirect
- golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
- golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
- golang.org/x/net v0.6.0 // indirect
- golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
- golang.org/x/sys v0.5.0 // indirect
- golang.org/x/term v0.5.0 // indirect
- golang.org/x/text v0.7.0 // indirect
- golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
- golang.org/x/tools v0.1.12 // indirect
- golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
- gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect
- google.golang.org/api v0.20.0 // indirect
- google.golang.org/appengine v1.6.6 // indirect
- google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
- google.golang.org/grpc v1.30.0 // indirect
- google.golang.org/protobuf v1.27.1 // indirect
+ github.com/stretchr/testify v1.8.2 // indirect
+ github.com/ulikunitz/xz v0.5.11 // indirect
+ github.com/xanzy/ssh-agent v0.3.3 // indirect
+ go.opencensus.io v0.24.0 // indirect
+ go.uber.org/atomic v1.11.0 // indirect
+ go.uber.org/multierr v1.11.0 // indirect
+ golang.org/x/mod v0.10.0 // indirect
+ golang.org/x/net v0.10.0 // indirect
+ golang.org/x/oauth2 v0.8.0 // indirect
+ golang.org/x/sys v0.8.0 // indirect
+ golang.org/x/term v0.8.0 // indirect
+ golang.org/x/text v0.9.0 // indirect
+ golang.org/x/time v0.3.0 // indirect
+ golang.org/x/tools v0.9.3 // indirect
+ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
+ gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
+ google.golang.org/api v0.125.0 // indirect
+ google.golang.org/appengine v1.6.7 // indirect
+ google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
+ google.golang.org/grpc v1.55.0 // indirect
+ google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
- gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
- gopkg.in/yaml.v2 v2.3.0 // indirect
+ gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
- honnef.co/go/tools v0.0.1-2020.1.3 // indirect
- k8s.io/component-base v0.20.1 // indirect
- k8s.io/klog/v2 v2.4.0 // indirect
- k8s.io/utils v0.0.0-20210802155522-efc7438f0176 // indirect
- sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect
- sigs.k8s.io/yaml v1.2.0 // indirect
+ k8s.io/component-base v0.27.2 // indirect
+ k8s.io/klog/v2 v2.100.1 // indirect
+ k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
+ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+ sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+ sigs.k8s.io/yaml v1.3.0 // indirect
)
diff --git a/go.sum b/go.sum
index 9df960247f21cd2ff0d6a05113f08aa8decc14d9..7c5689c06a050804d6deb3c5e90f23c40adb0bb1 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,4 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
@@ -7,184 +8,298 @@ cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg
cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0 h1:3ithwDMr7/3vpAMXiH+ZQnYbuIsh+OPhUPMFC9enmn0=
cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
+cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
+cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
+cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
+cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
+cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
+cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
+cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
+cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
+cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
+cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
+cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
+cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
+cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
+cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
+cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A=
+cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc=
+cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU=
+cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA=
+cloud.google.com/go v0.110.2 h1:sdFPBr6xG9/wkBbfhmUz/JmZC7X6LavQgcrVINrKiVA=
+cloud.google.com/go v0.110.2/go.mod h1:k04UEeEtb6ZBRTv3dZz4CeJC3jKGxyhl0sAiVVquxiw=
+cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw=
+cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY=
+cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI=
+cloud.google.com/go/analytics v0.12.0/go.mod h1:gkfj9h6XRf9+TS4bmuhPEShsh3hH8PAZzm/41OOhQd4=
+cloud.google.com/go/area120 v0.5.0/go.mod h1:DE/n4mp+iqVyvxHN41Vf1CR602GiHQjFPusMFW6bGR4=
+cloud.google.com/go/area120 v0.6.0/go.mod h1:39yFJqWVgm0UZqWTOdqkLhjoC7uFfgXRC8g/ZegeAh0=
+cloud.google.com/go/artifactregistry v1.6.0/go.mod h1:IYt0oBPSAGYj/kprzsBjZ/4LnG/zOcHyFHjWPCi6SAQ=
+cloud.google.com/go/artifactregistry v1.7.0/go.mod h1:mqTOFOnGZx8EtSqK/ZWcsm/4U8B77rbcLP6ruDU2Ixk=
+cloud.google.com/go/asset v1.5.0/go.mod h1:5mfs8UvcM5wHhqtSv8J1CtxxaQq3AdBxxQi2jGW/K4o=
+cloud.google.com/go/asset v1.7.0/go.mod h1:YbENsRK4+xTiL+Ofoj5Ckf+O17kJtgp3Y3nn4uzZz5s=
+cloud.google.com/go/asset v1.8.0/go.mod h1:mUNGKhiqIdbr8X7KNayoYvyc4HbbFO9URsjbytpUaW0=
+cloud.google.com/go/assuredworkloads v1.5.0/go.mod h1:n8HOZ6pff6re5KYfBXcFvSViQjDwxFkAkmUFffJRbbY=
+cloud.google.com/go/assuredworkloads v1.6.0/go.mod h1:yo2YOk37Yc89Rsd5QMVECvjaMKymF9OP+QXWlKXUkXw=
+cloud.google.com/go/assuredworkloads v1.7.0/go.mod h1:z/736/oNmtGAyU47reJgGN+KVoYoxeLBoj4XkKYscNI=
+cloud.google.com/go/automl v1.5.0/go.mod h1:34EjfoFGMZ5sgJ9EoLsRtdPSNZLcfflJR39VbVNS2M0=
+cloud.google.com/go/automl v1.6.0/go.mod h1:ugf8a6Fx+zP0D59WLhqgTDsQI9w07o64uf/Is3Nh5p8=
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0 h1:xE3CPsOgttP4ACBePh79zTKALtXwn/Edhcr16R5hMWU=
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/bigquery v1.42.0/go.mod h1:8dRTJxhtG+vwBKzE5OseQn/hiydoQN3EedCaOdYmxRA=
+cloud.google.com/go/billing v1.4.0/go.mod h1:g9IdKBEFlItS8bTtlrZdVLWSSdSyFUZKXNS02zKMOZY=
+cloud.google.com/go/billing v1.5.0/go.mod h1:mztb1tBc3QekhjSgmpf/CV4LzWXLzCArwpLmP2Gm88s=
+cloud.google.com/go/binaryauthorization v1.1.0/go.mod h1:xwnoWu3Y84jbuHa0zd526MJYmtnVXn0syOjaJgy4+dM=
+cloud.google.com/go/binaryauthorization v1.2.0/go.mod h1:86WKkJHtRcv5ViNABtYMhhNWRrD1Vpi//uKEy7aYEfI=
+cloud.google.com/go/cloudtasks v1.5.0/go.mod h1:fD92REy1x5woxkKEkLdvavGnPJGEn8Uic9nWuLzqCpY=
+cloud.google.com/go/cloudtasks v1.6.0/go.mod h1:C6Io+sxuke9/KNRkbQpihnW93SWDU3uXt92nu85HkYI=
+cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow=
+cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM=
+cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M=
+cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s=
+cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU=
+cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U=
+cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU=
+cloud.google.com/go/compute v1.20.0 h1:cUOcywWuowO9It2i1KX1lIb0HH7gLv6nENKuZGnlcSo=
+cloud.google.com/go/compute v1.20.0/go.mod h1:kn5BhC++qUWR/AM3Dn21myV7QbgqejW04cAOrtppaQI=
+cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
+cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
+cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I=
+cloud.google.com/go/containeranalysis v0.6.0/go.mod h1:HEJoiEIu+lEXM+k7+qLCci0h33lX3ZqoYFdmPcoO7s4=
+cloud.google.com/go/datacatalog v1.3.0/go.mod h1:g9svFY6tuR+j+hrTw3J2dNcmI0dzmSiyOzm8kpLq0a0=
+cloud.google.com/go/datacatalog v1.5.0/go.mod h1:M7GPLNQeLfWqeIm3iuiruhPzkt65+Bx8dAKvScX8jvs=
+cloud.google.com/go/datacatalog v1.6.0/go.mod h1:+aEyF8JKg+uXcIdAmmaMUmZ3q1b/lKLtXCmXdnc0lbc=
+cloud.google.com/go/dataflow v0.6.0/go.mod h1:9QwV89cGoxjjSR9/r7eFDqqjtvbKxAK2BaYU6PVk9UM=
+cloud.google.com/go/dataflow v0.7.0/go.mod h1:PX526vb4ijFMesO1o202EaUmouZKBpjHsTlCtB4parQ=
+cloud.google.com/go/dataform v0.3.0/go.mod h1:cj8uNliRlHpa6L3yVhDOBrUXH+BPAO1+KFMQQNSThKo=
+cloud.google.com/go/dataform v0.4.0/go.mod h1:fwV6Y4Ty2yIFL89huYlEkwUPtS7YZinZbzzj5S9FzCE=
+cloud.google.com/go/datalabeling v0.5.0/go.mod h1:TGcJ0G2NzcsXSE/97yWjIZO0bXj0KbVlINXMG9ud42I=
+cloud.google.com/go/datalabeling v0.6.0/go.mod h1:WqdISuk/+WIGeMkpw/1q7bK/tFEZxsrFJOJdY2bXvTQ=
+cloud.google.com/go/dataqna v0.5.0/go.mod h1:90Hyk596ft3zUQ8NkFfvICSIfHFh1Bc7C4cK3vbhkeo=
+cloud.google.com/go/dataqna v0.6.0/go.mod h1:1lqNpM7rqNLVgWBJyk5NF6Uen2PHym0jtVJonplVsDA=
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0 h1:/May9ojXjRkPBNVrq+oWLqmWCkr4OU5uRY29bu0mRyQ=
cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk=
+cloud.google.com/go/datastream v1.2.0/go.mod h1:i/uTP8/fZwgATHS/XFu0TcNUhuA0twZxxQ3EyCUQMwo=
+cloud.google.com/go/datastream v1.3.0/go.mod h1:cqlOX8xlyYF/uxhiKn6Hbv6WjwPPuI9W2M9SAXwaLLQ=
+cloud.google.com/go/dialogflow v1.15.0/go.mod h1:HbHDWs33WOGJgn6rfzBW1Kv807BE3O1+xGbn59zZWI4=
+cloud.google.com/go/dialogflow v1.16.1/go.mod h1:po6LlzGfK+smoSmTBnbkIZY2w8ffjz/RcGSS+sh1el0=
+cloud.google.com/go/dialogflow v1.17.0/go.mod h1:YNP09C/kXA1aZdBgC/VtXX74G/TKn7XVCcVumTflA+8=
+cloud.google.com/go/documentai v1.7.0/go.mod h1:lJvftZB5NRiFSX4moiye1SMxHx0Bc3x1+p9e/RfXYiU=
+cloud.google.com/go/documentai v1.8.0/go.mod h1:xGHNEB7CtsnySCNrCFdCyyMz44RhFEEX2Q7UD0c5IhU=
+cloud.google.com/go/domains v0.6.0/go.mod h1:T9Rz3GasrpYk6mEGHh4rymIhjlnIuB4ofT1wTxDeT4Y=
+cloud.google.com/go/domains v0.7.0/go.mod h1:PtZeqS1xjnXuRPKE/88Iru/LdfoRyEHYA9nFQf4UKpg=
+cloud.google.com/go/edgecontainer v0.1.0/go.mod h1:WgkZ9tp10bFxqO8BLPqv2LlfmQF1X8lZqwW4r1BTajk=
+cloud.google.com/go/edgecontainer v0.2.0/go.mod h1:RTmLijy+lGpQ7BXuTDa4C4ssxyXT34NIuHIgKuP4s5w=
+cloud.google.com/go/functions v1.6.0/go.mod h1:3H1UA3qiIPRWD7PeZKLvHZ9SaQhR26XIJcC0A5GbvAk=
+cloud.google.com/go/functions v1.7.0/go.mod h1:+d+QBcWM+RsrgZfV9xo6KfA1GlzJfxcfZcRPEhDDfzg=
+cloud.google.com/go/gaming v1.5.0/go.mod h1:ol7rGcxP/qHTRQE/RO4bxkXq+Fix0j6D4LFPzYTIrDM=
+cloud.google.com/go/gaming v1.6.0/go.mod h1:YMU1GEvA39Qt3zWGyAVA9bpYz/yAhTvaQ1t2sK4KPUA=
+cloud.google.com/go/gkeconnect v0.5.0/go.mod h1:c5lsNAg5EwAy7fkqX/+goqFsU1Da/jQFqArp+wGNr/o=
+cloud.google.com/go/gkeconnect v0.6.0/go.mod h1:Mln67KyU/sHJEBY8kFZ0xTeyPtzbq9StAVvEULYK16A=
+cloud.google.com/go/gkehub v0.9.0/go.mod h1:WYHN6WG8w9bXU0hqNxt8rm5uxnk8IH+lPY9J2TV7BK0=
+cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y977wO+hBH0=
+cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc=
+cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY=
+cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc=
+cloud.google.com/go/iam v1.1.0 h1:67gSqaPukx7O8WLLHMa0PNs3EBGd2eE4d+psbO/CO94=
+cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5gVyk=
+cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic=
+cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI=
+cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8=
+cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08=
+cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4=
+cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w=
+cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE=
+cloud.google.com/go/memcache v1.5.0/go.mod h1:dk3fCK7dVo0cUU2c36jKb4VqKPS22BTkf81Xq617aWM=
+cloud.google.com/go/metastore v1.5.0/go.mod h1:2ZNrDcQwghfdtCwJ33nM0+GrBGlVuh8rakL3vdPY3XY=
+cloud.google.com/go/metastore v1.6.0/go.mod h1:6cyQTls8CWXzk45G55x57DVQ9gWg7RiH65+YgPsNh9s=
+cloud.google.com/go/networkconnectivity v1.4.0/go.mod h1:nOl7YL8odKyAOtzNX73/M5/mGZgqqMeryi6UPZTk/rA=
+cloud.google.com/go/networkconnectivity v1.5.0/go.mod h1:3GzqJx7uhtlM3kln0+x5wyFvuVH1pIBJjhCpjzSt75o=
+cloud.google.com/go/networksecurity v0.5.0/go.mod h1:xS6fOCoqpVC5zx15Z/MqkfDwH4+m/61A3ODiDV1xmiQ=
+cloud.google.com/go/networksecurity v0.6.0/go.mod h1:Q5fjhTr9WMI5mbpRYEbiexTzROf7ZbDzvzCrNl14nyU=
+cloud.google.com/go/notebooks v1.2.0/go.mod h1:9+wtppMfVPUeJ8fIWPOq1UnATHISkGXGqTkxeieQ6UY=
+cloud.google.com/go/notebooks v1.3.0/go.mod h1:bFR5lj07DtCPC7YAAJ//vHskFBxA5JzYlH68kXVdk34=
+cloud.google.com/go/osconfig v1.7.0/go.mod h1:oVHeCeZELfJP7XLxcBGTMBvRO+1nQ5tFG9VQTmYS2Fs=
+cloud.google.com/go/osconfig v1.8.0/go.mod h1:EQqZLu5w5XA7eKizepumcvWx+m8mJUhEwiPqWiZeEdg=
+cloud.google.com/go/oslogin v1.4.0/go.mod h1:YdgMXWRaElXz/lDk1Na6Fh5orF7gvmJ0FGLIs9LId4E=
+cloud.google.com/go/oslogin v1.5.0/go.mod h1:D260Qj11W2qx/HVF29zBg+0fd6YCSjSqLUkY/qEenQU=
+cloud.google.com/go/phishingprotection v0.5.0/go.mod h1:Y3HZknsK9bc9dMi+oE8Bim0lczMU6hrX0UpADuMefr0=
+cloud.google.com/go/phishingprotection v0.6.0/go.mod h1:9Y3LBLgy0kDTcYET8ZH3bq/7qni15yVUoAxiFxnlSUA=
+cloud.google.com/go/privatecatalog v0.5.0/go.mod h1:XgosMUvvPyxDjAVNDYxJ7wBW8//hLDDYmnsNcMGq1K0=
+cloud.google.com/go/privatecatalog v0.6.0/go.mod h1:i/fbkZR0hLN29eEWiiwue8Pb+GforiEIBnV9yrRUOKI=
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0 h1:Lpy6hKgdcl7a3WGSfJIFmxmcdjSpP6OmBEfcOv1Y680=
cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/recaptchaenterprise v1.3.1/go.mod h1:OdD+q+y4XGeAlxRaMn1Y7/GveP6zmq76byL6tjPE7d4=
+cloud.google.com/go/recaptchaenterprise/v2 v2.1.0/go.mod h1:w9yVqajwroDNTfGuhmOjPDN//rZGySaf6PtFVcSCa7o=
+cloud.google.com/go/recaptchaenterprise/v2 v2.2.0/go.mod h1:/Zu5jisWGeERrd5HnlS3EUGb/D335f9k51B/FVil0jk=
+cloud.google.com/go/recaptchaenterprise/v2 v2.3.0/go.mod h1:O9LwGCjrhGHBQET5CA7dd5NwwNQUErSgEDit1DLNTdo=
+cloud.google.com/go/recommendationengine v0.5.0/go.mod h1:E5756pJcVFeVgaQv3WNpImkFP8a+RptV6dDLGPILjvg=
+cloud.google.com/go/recommendationengine v0.6.0/go.mod h1:08mq2umu9oIqc7tDy8sx+MNJdLG0fUi3vaSVbztHgJ4=
+cloud.google.com/go/recommender v1.5.0/go.mod h1:jdoeiBIVrJe9gQjwd759ecLJbxCDED4A6p+mqoqDvTg=
+cloud.google.com/go/recommender v1.6.0/go.mod h1:+yETpm25mcoiECKh9DEScGzIRyDKpZ0cEhWGo+8bo+c=
+cloud.google.com/go/redis v1.7.0/go.mod h1:V3x5Jq1jzUcg+UNsRvdmsfuFnit1cfe3Z/PGyq/lm4Y=
+cloud.google.com/go/redis v1.8.0/go.mod h1:Fm2szCDavWzBk2cDKxrkmWBqoCiL1+Ctwq7EyqBCA/A=
+cloud.google.com/go/retail v1.8.0/go.mod h1:QblKS8waDmNUhghY2TI9O3JLlFk8jybHeV4BF19FrE4=
+cloud.google.com/go/retail v1.9.0/go.mod h1:g6jb6mKuCS1QKnH/dpu7isX253absFl6iE92nHwlBUY=
+cloud.google.com/go/scheduler v1.4.0/go.mod h1:drcJBmxF3aqZJRhmkHQ9b3uSSpQoltBPGPxGAWROx6s=
+cloud.google.com/go/scheduler v1.5.0/go.mod h1:ri073ym49NW3AfT6DZi21vLZrG07GXr5p3H1KxN5QlI=
+cloud.google.com/go/secretmanager v1.6.0/go.mod h1:awVa/OXF6IiyaU1wQ34inzQNc4ISIDIrId8qE5QGgKA=
+cloud.google.com/go/security v1.5.0/go.mod h1:lgxGdyOKKjHL4YG3/YwIL2zLqMFCKs0UbQwgyZmfJl4=
+cloud.google.com/go/security v1.7.0/go.mod h1:mZklORHl6Bg7CNnnjLH//0UlAlaXqiG7Lb9PsPXLfD0=
+cloud.google.com/go/security v1.8.0/go.mod h1:hAQOwgmaHhztFhiQ41CjDODdWP0+AE1B3sX4OFlq+GU=
+cloud.google.com/go/securitycenter v1.13.0/go.mod h1:cv5qNAqjY84FCN6Y9z28WlkKXyWsgLO832YiWwkCWcU=
+cloud.google.com/go/securitycenter v1.14.0/go.mod h1:gZLAhtyKv85n52XYWt6RmeBdydyxfPeTrpToDPw4Auc=
+cloud.google.com/go/servicedirectory v1.4.0/go.mod h1:gH1MUaZCgtP7qQiI+F+A+OpeKF/HQWgtAddhTbhL2bs=
+cloud.google.com/go/servicedirectory v1.5.0/go.mod h1:QMKFL0NUySbpZJ1UZs3oFAmdvVxhhxB6eJ/Vlp73dfg=
+cloud.google.com/go/speech v1.6.0/go.mod h1:79tcr4FHCimOp56lwC01xnt/WPJZc4v3gzyT7FoBkCM=
+cloud.google.com/go/speech v1.7.0/go.mod h1:KptqL+BAQIhMsj1kOP2la5DSEEerPDuOP/2mmkhHhZQ=
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0 h1:UDpwYIwla4jHGzZJaEJYx1tOejbgSoNqsAfHAUYe2r8=
cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
+cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y=
+cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc=
+cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s=
+cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM=
+cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E=
+cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw=
+cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g=
+cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU=
+cloud.google.com/go/videointelligence v1.7.0/go.mod h1:k8pI/1wAhjznARtVT9U1llUaFNPh7muw8QyOUpavru4=
+cloud.google.com/go/vision v1.2.0/go.mod h1:SmNwgObm5DpFBme2xpyOyasvBc1aPdjvMk2bBk0tKD0=
+cloud.google.com/go/vision/v2 v2.2.0/go.mod h1:uCdV4PpN1S0jyCyq8sIM42v2Y6zOLkZs+4R9LrGYwFo=
+cloud.google.com/go/vision/v2 v2.3.0/go.mod h1:UO61abBx9QRMFkNBbf1D8B1LXdS2cGiiCRx0vSpZoUo=
+cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xXZmFiHmGE=
+cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg=
+cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0=
+cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
-github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
-github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
-github.com/Azure/go-autorest/autorest v0.11.1 h1:eVvIXUKiTgv++6YnWb42DUA1YL7qDugnKP0HljexdnQ=
-github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
-github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
-github.com/Azure/go-autorest/autorest/adal v0.9.5 h1:Y3bBUV4rTuxenJJs41HU3qmqsb+auo+a3Lz+PlJPpL0=
-github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
-github.com/Azure/go-autorest/autorest/adal v0.9.23 h1:Yepx8CvFxwNKpH6ja7RZ+sKX+DWYNldbLiALMC3BTz8=
-github.com/Azure/go-autorest/autorest/adal v0.9.23/go.mod h1:5pcMqFkdPhviJdlEy3kC/v1ZLnQl0MH6XA5YCcMhy4c=
-github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw=
-github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
-github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
-github.com/Azure/go-autorest/autorest/mocks v0.4.1 h1:K0laFcLE6VLTOwNgSxaGbUcLPuGXlNkbVvq4cW4nIHk=
-github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
-github.com/Azure/go-autorest/logger v0.2.0 h1:e4RVHVZKC5p6UANLJHkM4OfR1UKZPj8Wt8Pcx+3oqrE=
-github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
-github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg=
-github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
-github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
-github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
-github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd h1:sjQovDkwrZp8u+gxLtPgKGjk5hCxuy2hrRejBTA9xFU=
-github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd/go.mod h1:64YHyfSL2R96J44Nlwm39UHepQbyR5q10x7iYa1ks2E=
-github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
+github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
+github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
+github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
+github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
+github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
-github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
-github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
-github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
-github.com/aws/aws-sdk-go v1.27.0 h1:0xphMHGMLBrPMfxR2AmVjZKcMEESEgWF8Kru94BNByk=
-github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
+github.com/aws/aws-sdk-go v1.44.278 h1:jJFDO/unYFI48WQk7UGSyO3rBA/gnmRpNYNuAw/fPgE=
+github.com/aws/aws-sdk-go v1.44.278/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
+github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d h1:xDfNPAt8lFiC1UJrqV3uuy861HCTo708pDMbjHHdCas=
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d/go.mod h1:6QX/PXZ00z/TKoufEY6K/a0k6AhaJrQKdFe6OfVXsa4=
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
-github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=
-github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
-github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
-github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
-github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
-github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
-github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=
-github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
-github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg=
+github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE=
+github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
+github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
+github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
+github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
+github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/evanphx/json-patch v4.5.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses=
-github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
+github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww=
+github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/flowstack/go-jsonschema v0.1.1/go.mod h1:yL7fNggx1o8rm9RlgXv7hTBWxdBM0rVwpMwimd3F3N0=
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
-github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk=
-github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
-github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
+github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0=
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
-github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
-github.com/go-logr/logr v0.3.0 h1:q4c+kbcR0d5rSurhBR8dIgieOaYpXtsdTYfx22Cu6rs=
-github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
-github.com/go-logr/zapr v0.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4=
-github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU=
-github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
-github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc=
-github.com/go-openapi/jsonreference v0.19.3 h1:5cxNfTy0UVC3X8JL5ymxzyoUZmo8iZb+jeTWn7tUa8o=
-github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
-github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo=
-github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
-github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
-github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
-github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
+github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo=
+github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA=
+github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
+github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
+github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
+github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
+github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
+github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
+github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
+github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
+github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
@@ -194,241 +309,176 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/gnostic v0.6.9 h1:ZK/5VhkoX835RikCHpSUJV9a+S3e1zLh59YnyWeBW+0=
+github.com/google/gnostic v0.6.9/go.mod h1:Nm8234We1lq6iB9OmlgNv3nH91XLLVZHCDayfA3xq+E=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4/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.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
-github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
+github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
+github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
+github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
+github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc=
+github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A=
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
+github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8=
+github.com/googleapis/enterprise-certificate-proxy v0.2.0/go.mod h1:8C0jb7/mgJe/9KK8Lm7X9ctZC2t60YyIpYEI16jx0Qg=
+github.com/googleapis/enterprise-certificate-proxy v0.2.4 h1:uGy6JWR/uMIILU8wbf+OkstIrNiMjGpEIyhx8f6W7s4=
+github.com/googleapis/enterprise-certificate-proxy v0.2.4/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg=
-github.com/googleapis/gnostic v0.5.1 h1:A8Yhf6EtqTv9RMsU6MQTyrtV1TjWlR6xU9BsZIwuTCM=
-github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
-github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
-github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
-github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
-github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-getter v1.5.2 h1:XDo8LiAcDisiqZdv0TKgz+HtX3WN7zA2JD1R1tjsabE=
-github.com/hashicorp/go-getter v1.5.2/go.mod h1:orNH3BTYLu/fIxGIdLjLoAJHWMDQ/UKQr5O4m3iBuoo=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU=
+github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
+github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
+github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM=
+github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM=
+github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c=
+github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo=
+github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY=
+github.com/googleapis/gax-go/v2 v2.10.0 h1:ebSgKfMxynOdxw8QQuFOKMgomqeLGPqNLQox2bo42zg=
+github.com/googleapis/gax-go/v2 v2.10.0/go.mod h1:4UOEnMCrxsSqQ940WnTiD6qJ63le2ev3xfyagutxiPw=
+github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
+github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
+github.com/hashicorp/go-getter v1.7.1 h1:SWiSWN/42qdpR0MdhaOc/bLR48PLuP1ZQtYLRlM69uY=
+github.com/hashicorp/go-getter v1.7.1/go.mod h1:W7TalhMmbPmsSMdNjD0ZskARur/9GJ17cfHTRtXV744=
github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/go-version v1.2.0 h1:3vNe/fWF5CBgRIguda1meWhsZHy3m8gCJ5wx+dIzX/E=
-github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
+github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek=
+github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
-github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
-github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc=
-github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/isaaguilar/selfsigned v1.0.0 h1:Ji3krbApCU5A4hUIKk6ZduwWMwefEqtB4n1QbMlR5do=
-github.com/isaaguilar/selfsigned v1.0.0/go.mod h1:il897HUV56AD3gN+dyQJnYhI6ruFfb8E/HaL36bQu5Y=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
+github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
+github.com/isaaguilar/selfsigned v1.1.0 h1:soDIS680j4HGzjl8tsYbUVyL4BvVTo2db60vfq7lRD8=
+github.com/isaaguilar/selfsigned v1.1.0/go.mod h1:il897HUV56AD3gN+dyQJnYhI6ruFfb8E/HaL36bQu5Y=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1 h1:6QPYqodiu3GuPL+7mfx+NwDdp2eTkp9IfEUpgAwUN0o=
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY=
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
+github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
+github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.11.2 h1:MiK62aErc3gIiVEtyzKfeOHgW7atJb5g/KNX5m3c2nQ=
-github.com/klauspost/compress v1.11.2/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
+github.com/klauspost/compress v1.16.5 h1:IFV2oUNUzZaz+XyusxpLzpzS8Pt5rh0Z16For/djlyI=
+github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA=
github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.0 h1:aizVhC/NAAcKWb+5QsU1iNOZb4Yws5UO2I+aIprQITM=
-github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI=
-github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
-github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
-github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
-github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
+github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU=
+github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8=
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
-github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
-github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.14.1 h1:jMU0WaQrP0a/YAEq8eJmJKjBoMs+pClEr1vDMlM/Do4=
-github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
-github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.10.2 h1:aY/nuoWlKJud2J6U0E3NWsjlg+0GtwXxgEqthRdzlcs=
-github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
+github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
-github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA=
-github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI=
+github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc=
-github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4=
-github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY=
+github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
+github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
+github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
+github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
+github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
+github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
+github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
+github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
-github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
-github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI=
-github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
-github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
github.com/src-d/gcfg v1.4.0 h1:xXbNR5AlLSA315x2UO+fTSSAXCDf+Ar38/6oyGbDKQ4=
github.com/src-d/gcfg v1.4.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -436,63 +486,60 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/ulikunitz/xz v0.5.8 h1:ERv8V6GKqVi23rgu5cj9pVfVzJbOqAY2Ntl88O6c2nQ=
-github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
-github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70=
+github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8=
+github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4=
-github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM=
+github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw=
+github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
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=
-go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
-go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0=
-go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
-go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
-go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
-go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
-go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
-go.uber.org/zap v1.8.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-go.uber.org/zap v1.15.0 h1:ZZCA22JRF2gQE5FoNmhmrf7jeJJ2uhqDUNRYKm8dvmM=
-go.uber.org/zap v1.15.0/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
+go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
+go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
+go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
+go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
+go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
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 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE=
-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.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
+golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -505,6 +552,7 @@ golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EH
golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -513,8 +561,9 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
@@ -523,15 +572,14 @@ 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.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
+golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
+golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181220203305-927f97764cc3/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-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -539,11 +587,9 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -551,54 +597,94 @@ golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/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-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
+golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220617184016-355a448f1bc9/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
+golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
+golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
+golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc=
+golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
+golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE=
+golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg=
+golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A=
+golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
+golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
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-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/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-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/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-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -606,64 +692,94 @@ golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/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-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/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-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220615213510-4f61da869c0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/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/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
+golang.org/x/sys v0.8.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.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
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.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-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=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
-golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190729092621-ff9f1409240a/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI=
golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
@@ -678,20 +794,44 @@ golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapK
golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/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-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
+golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
+golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
+golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
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=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gomodules.xyz/jsonpatch/v2 v2.1.0 h1:Phva6wqu+xR//Njw6iorylFFgn/z547tw5Ne3HZPQ+k=
-gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
+golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
+golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc=
+gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
@@ -701,14 +841,55 @@ google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsb
google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0 h1:jz2KixHX7EcCPiQrySzPdnYT7DbINAypCqKZ1Z7GM40=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
+google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
+google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
+google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
+google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
+google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
+google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
+google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
+google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
+google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
+google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
+google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
+google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
+google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
+google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
+google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo=
+google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g=
+google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA=
+google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8=
+google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs=
+google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
+google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA=
+google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw=
+google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg=
+google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o=
+google.golang.org/api v0.85.0/go.mod h1:AqZf8Ep9uZ2pyTvgL+x0D3Zt0eoT9b5E8fmzfu6FO2g=
+google.golang.org/api v0.90.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
+google.golang.org/api v0.93.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw=
+google.golang.org/api v0.95.0/go.mod h1:eADj+UBuxkh5zlrSntJghuNeg8HwQ1w5lTKkuqaETEI=
+google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
+google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
+google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s=
+google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70=
+google.golang.org/api v0.125.0 h1:7xGvEY4fyWbhWMHf3R2/4w7L4fXyfpRGE9g6lp8+DCk=
+google.golang.org/api v0.125.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc=
google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -726,12 +907,135 @@ google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvx
google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a h1:pOwg4OoaRYScjmR4LlLgdtnyoHYTSAVhhqe5uPdpII8=
-google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=
+google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
+google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
+google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
+google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
+google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
+google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
+google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
+google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
+google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
+google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
+google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
+google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220207164111-0872dc986b00/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
+google.golang.org/genproto v0.0.0-20220218161850-94dd64e39d7c/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
+google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
+google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
+google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI=
+google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E=
+google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo=
+google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4=
+google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
+google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252/go.mod h1:GkXuJDJ6aQ7lnJcRF+SJVgFdQhypqgl3LB1C9vabdRE=
+google.golang.org/genproto v0.0.0-20220801145646-83ce21fca29f/go.mod h1:iHe1svFLAZg9VWz891+QbRMwUv9O/1Ww+/mngYeThbc=
+google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220817144833-d7fd3f11b9b1/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220829144015-23454907ede3/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220829175752-36a9c930ecbf/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
+google.golang.org/genproto v0.0.0-20220913154956-18f8339a66a5/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220914142337-ca0e39ece12f/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220916172020-2692e8806bfa/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220919141832-68c03719ef51/go.mod h1:0Nb8Qy+Sk5eDzHnzlStwW3itdNaWoZA5XeSG+R3JHSo=
+google.golang.org/genproto v0.0.0-20220920201722-2b89144ce006/go.mod h1:ht8XFiar2npT/g4vkk7O0WYS1sHOHbdujxbEp7CJWbw=
+google.golang.org/genproto v0.0.0-20220926165614-551eb538f295/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI=
+google.golang.org/genproto v0.0.0-20220926220553-6981cbe3cfce/go.mod h1:woMGP53BroOrRY3xTxlbr8Y3eB/nzAvvFM83q7kG2OI=
+google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U=
+google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM=
+google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s=
+google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc h1:8DyZCyvI8mE1IdLy/60bS+52xfymkE72wv1asokgtao=
+google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:xZnkP7mREFX5MORlOPEzLMr+90PPZQ2QWzrVTWfAq64=
+google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc h1:kVKPf/IiYSBWEWtkIn6wZXwWGCnLKcC8oWfZvXjsGnM=
+google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
+google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
+google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
+google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
+google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
+google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
+google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ=
+google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
+google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
+google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
+google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
+google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
@@ -744,90 +1048,68 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/cheggaaa/pb.v1 v1.0.27/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
-gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
-gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
gopkg.in/src-d/go-billy.v4 v4.3.2 h1:0SQA1pRztfTFx2miS8sA97XvooFeNOmvUenF4o0EcVg=
gopkg.in/src-d/go-billy.v4 v4.3.2/go.mod h1:nDjArDMp+XMs1aFAESLRjfGSgfvoYN0hDfzEk0GjC98=
gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 h1:ivZFOIltbce2Mo8IjzUHAFoq/IylO9WHhNOAJK+LsJg=
gopkg.in/src-d/go-git-fixtures.v3 v3.5.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
gopkg.in/src-d/go-git.v4 v4.13.1 h1:SRtFyV8Kxc0UP7aCHcijOMQGPxHSmMOPrzulQWolkYE=
gopkg.in/src-d/go-git.v4 v4.13.1/go.mod h1:nx5NYcxdKxq5fpltdHnPa2Exj4Sx0EclMWZQbYDu2z8=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
-gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
-gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3 h1:sXmLre5bzIR6ypkjXCDI3jHPssRhc8KD/Ome589sc3U=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.20.1 h1:ud1c3W3YNzGd6ABJlbFfKXBKXO+1KdGfcgGGNgFR03E=
-k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo=
-k8s.io/apiextensions-apiserver v0.20.1 h1:ZrXQeslal+6zKM/HjDXLzThlz/vPSxrfK3OqL8txgVQ=
-k8s.io/apiextensions-apiserver v0.20.1/go.mod h1:ntnrZV+6a3dB504qwC5PN/Yg9PBiDNt1EVqbW2kORVk=
-k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
-k8s.io/apimachinery v0.20.2 h1:hFx6Sbt1oG0n6DZ+g4bFt5f6BoMkOjKWsQFu077M3Vg=
-k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
-k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU=
-k8s.io/client-go v0.20.1 h1:Qquik0xNFbK9aUG92pxHYsyfea5/RPO9o9bSywNor+M=
-k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y=
-k8s.io/code-generator v0.20.1/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
-k8s.io/component-base v0.20.1 h1:6OQaHr205NSl24t5wOF2IhdrlxZTWEZwuGlLvBgaeIg=
-k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk=
-k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
-k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
-k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
-k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf h1:M9XBsiMslw2lb2ZzglC0TOkBPK5NQi0/noUrdnoFwUg=
-k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk=
-k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20210802155522-efc7438f0176 h1:Mx0aa+SUAcNRQbs5jUzV8lkDlGFU8laZsY9jrcVX5SY=
-k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo=
+k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4=
+k8s.io/apiextensions-apiserver v0.27.2 h1:iwhyoeS4xj9Y7v8YExhUwbVuBhMr3Q4bd/laClBV6Bo=
+k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ=
+k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg=
+k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
+k8s.io/client-go v0.27.2 h1:vDLSeuYvCHKeoQRhCXjxXO45nHVv2Ip4Fe0MfioMrhE=
+k8s.io/client-go v0.27.2/go.mod h1:tY0gVmUsHrAmjzHX9zs7eCjxcBsf8IiNe7KQ52biTcQ=
+k8s.io/component-base v0.27.2 h1:neju+7s/r5O4x4/txeUONNTS9r1HsPbyoPBAtHsDCpo=
+k8s.io/component-base v0.27.2/go.mod h1:5UPk7EjfgrfgRIuDBFtsEFAe4DAvP3U+M8RTzoSJkpo=
+k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
+k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
+k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
+k8s.io/utils v0.0.0-20230505201702-9f6742963106 h1:EObNQ3TW2D+WptiYXlApGNLVy0zm/JIBVY9i+M4wpAU=
+k8s.io/utils v0.0.0-20230505201702-9f6742963106/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
-sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
-sigs.k8s.io/controller-runtime v0.8.0 h1:s0dYdo7lQgJiAf+alP82PRwbz+oAqL3oSyMQ18XRDOc=
-sigs.k8s.io/controller-runtime v0.8.0/go.mod h1:v9Lbj5oX443uR7GXYY46E0EE2o7k2YxQ58GxVNeXSW4=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.2 h1:YHQV7Dajm86OuqnIR6zAelnDWBRjo+YhYV9PmGrh1s8=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
-sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
-sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
+sigs.k8s.io/controller-runtime v0.15.0 h1:ML+5Adt3qZnMSYxZ7gAverBLNPSMQEibtzAgp0UPojU=
+sigs.k8s.io/controller-runtime v0.15.0/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
+sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
diff --git a/hack/bundler.sh b/hack/bundler.sh
index 31d4bd2dd4ce4984048a6535b6d04af01b208ee7..57cb45d17aea947ba906092aaa2f5960c306481d 100644
--- a/hack/bundler.sh
+++ b/hack/bundler.sh
@@ -24,19 +24,9 @@ cat deploy/clusterrole.yaml >> $bundle
printf -- '\n\n---\n# clusterrolebinding\n' >> $bundle
cat deploy/clusterrolebinding.yaml >> $bundle
printf -- '\n\n---\n# deployment\n' >> $bundle
-yq write deploy/deployment.yaml spec.template.spec.containers[0].image "isaaguilar/terraform-operator:$ver" >> $bundle
-printf -- '\n\n---\n# webhook-clusterrole\n' >> $bundle
-cat deploy/webhook-clusterrole.yaml >> $bundle
-printf -- '\n\n---\n# webhook-clusterrolebinding\n' >> $bundle
-cat deploy/webhook-clusterrolebinding.yaml >> $bundle
-printf -- '\n\n---\n# webhook-deployment\n' >> $bundle
-yq write deploy/webhook-deployment.yaml spec.template.spec.containers[0].image "isaaguilar/terraform-operator:$ver" >> $bundle
-printf -- '\n\n---\n# webhook-service\n' >> $bundle
-cat deploy/webhook-service.yaml >> $bundle
-printf -- '\n\n---\n# webhook-serviceaccount\n' >> $bundle
-cat deploy/webhook-serviceaccount.yaml >> $bundle
+yq write deploy/deployment.yaml spec.template.spec.containers[0].image "ghcr.io/galleybytes/terraform-operator:$ver" >> $bundle
printf -- '\n\n---\n# crd\n' >> $bundle
-cat deploy/crds/tf.isaaguilar.com_terraforms_crd.yaml >> $bundle
+cat deploy/crds/tf.galleybytes.com_terraforms_crd.yaml >> $bundle
>&2 printf "Saved "
printf "$bundle\n"
diff --git a/hack/devbuild.sh b/hack/devbuild.sh
index b3951eaf490148d0777e6f74eed80c4fbcf98590..e255534808e5eb3fd7efac4b14716d74da286846 100644
--- a/hack/devbuild.sh
+++ b/hack/devbuild.sh
@@ -5,7 +5,7 @@ set -o pipefail
cd $(git rev-parse --show-toplevel)
build_version="$(git describe --tags --dirty)-$(date +%Y%m%d%H%M%S)"
-export IMG="isaaguilar/terraform-operator:$build_version"
+export IMG="ghcr.io/galleybytes/terraform-operator:$build_version"
printf "Will build $IMG\n"
make docker-build-local docker-push
diff --git a/pkg/apis/addtoscheme_tf_v1alpha2.go b/pkg/apis/addtoscheme_tf_v1alpha2.go
deleted file mode 100644
index e6d3b702b58c88e379f587da3e51dce833936c85..0000000000000000000000000000000000000000
--- a/pkg/apis/addtoscheme_tf_v1alpha2.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package apis
-
-import (
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2"
-)
-
-func init() {
- // Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
- AddToSchemes = append(AddToSchemes, v1alpha2.SchemeBuilder.AddToScheme)
-}
diff --git a/pkg/apis/addtoscheme_tf_v1alpha1.go b/pkg/apis/addtoscheme_tf_v1beta1.go
similarity index 51%
rename from pkg/apis/addtoscheme_tf_v1alpha1.go
rename to pkg/apis/addtoscheme_tf_v1beta1.go
index 032cc3d58d33025ba59a943b20d87aa3ac9a1489..b6a060b9633a7b41b016be7bdcfe114fe392ccd1 100644
--- a/pkg/apis/addtoscheme_tf_v1alpha1.go
+++ b/pkg/apis/addtoscheme_tf_v1beta1.go
@@ -1,10 +1,10 @@
package apis
import (
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1"
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1"
)
func init() {
// Register the types with the Scheme so the components can map objects to GroupVersionKinds and back
- AddToSchemes = append(AddToSchemes, v1alpha1.SchemeBuilder.AddToScheme)
+ AddToSchemes = append(AddToSchemes, v1beta1.SchemeBuilder.AddToScheme)
}
diff --git a/pkg/apis/tf/v1alpha1/doc.go b/pkg/apis/tf/v1alpha1/doc.go
deleted file mode 100644
index d7685dadfe0306a169034e05b187f30819bf0766..0000000000000000000000000000000000000000
--- a/pkg/apis/tf/v1alpha1/doc.go
+++ /dev/null
@@ -1,4 +0,0 @@
-// Package v1alpha1 contains API Schema definitions for the tf v1alpha1 API group
-// +k8s:deepcopy-gen=package,register
-// +groupName=tf.isaaguilar.com
-package v1alpha1
diff --git a/pkg/apis/tf/v1alpha1/terraform_types.go b/pkg/apis/tf/v1alpha1/terraform_types.go
deleted file mode 100644
index e7fc4ebb1573df8c54aea8d2089f9b579b15b15f..0000000000000000000000000000000000000000
--- a/pkg/apis/tf/v1alpha1/terraform_types.go
+++ /dev/null
@@ -1,520 +0,0 @@
-package v1alpha1
-
-import (
- corev1 "k8s.io/api/core/v1"
- rbacv1 "k8s.io/api/rbac/v1"
- "k8s.io/apimachinery/pkg/api/resource"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-)
-
-// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
-// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
-
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +genclient
-// Terraform is the Schema for the terraforms API
-// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
-// +k8s:openapi-gen=true
-// +kubebuilder:deprecatedversion:warning="tf.isaaguilar.com/v1alpha1 is no longer supported. Please upgrade to tf.isaaguilar.com/v1alpha2"
-// +kubebuilder:subresource:status
-// +kubebuilder:resource:path=terraforms,shortName=tf
-// +kubebuilder:singular=terraform
-type Terraform struct {
- metav1.TypeMeta `json:",inline"`
- metav1.ObjectMeta `json:"metadata,omitempty"`
-
- Spec TerraformSpec `json:"spec,omitempty"`
- Status TerraformStatus `json:"status,omitempty"`
-}
-
-// TerraformSpec defines the desired state of Terraform
-// +k8s:openapi-gen=true
-type TerraformSpec struct {
- // INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
- // Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file
- // Add custom validation using kubebuilder tags: https://book-v1.book.kubebuilder.io/beyond_basics/generating_crd.html
-
- // KeepLatestPodsOnly when true will keep only the pods that match the
- // current generation of the terraform k8s-resource. This overrides the
- // behavior of `keepCompletedPods`.
- KeepLatestPodsOnly bool `json:"keepLatestPodsOnly,omitempty"`
-
- // KeepCompletedPods when true will keep completed pods. Default is false
- // and completed pods are removed.
- KeepCompletedPods bool `json:"keepCompletedPods,omitempty"`
-
- // CleanupDisk will clear out previous terraform run data from the
- // persistent volume.
- CleanupDisk bool `json:"cleanupDisk,omitempty"`
-
- // PersistentVolumeSize define the size of the disk used to store
- // terraform run data. If not defined, a default of "2Gi" is used.
- PersistentVolumeSize *resource.Quantity `json:"persistentVolumeSize,omitempty"`
-
- // RunnerRules are RBAC rules that will be added to all runner pods.
- RunnerRules []rbacv1.PolicyRule `json:"runnerRules,omitempty"`
-
- // RunnerAnnotations are annotations that will be added to all runner pods.
- RunnerAnnotations map[string]string `json:"runnerAnnotations,omitempty"`
-
- // RunnerLabels key/value pairs that will be added as labels to runner pods
- RunnerLabels map[string]string `json:"runnerLabels,omitempty"`
-
- // TerraformVersion helps the operator decide which image tag to pull for
- // the terraform runner. Defaults to "0.11.14"
- TerraformVersion string `json:"terraformVersion,omitempty"`
- ScriptRunnerVersion string `json:"scriptRunnerVersion,omitempty"`
- SetupRunnerVersion string `json:"setupRunnerVersion,omitempty"`
-
- // TerraformRunner gives the user the ability to inject their own container
- // image to execute terraform. This is very helpful for users who need to
- // have a certain toolset installed on their images, or who can't pull
- // public images, such as the default image "isaaguilar/tfops".
- TerraformRunner string `json:"terraformRunner,omitempty"`
- ScriptRunner string `json:"scriptRunner,omitempty"`
- SetupRunner string `json:"setupRunner,omitempty"`
-
- // TerraformRunnerExecutionScriptConfigMap allows the user to define a
- // custom terraform runner script that gets executed instead of the default
- // script built into the runner image. The configmap "name" and "key" are
- // required.
- TerraformRunnerExecutionScriptConfigMap *corev1.ConfigMapKeySelector `json:"terraformRunnerExecutionScriptConfigMap,omitempty"`
-
- // ScriptRunnerExecutionScriptConfigMap allows the user to define a
- // custom terraform runner script that gets executed instead of the default
- // script built into the runner image. The configmap "name" and "key" are
- // required.
- ScriptRunnerExecutionScriptConfigMap *corev1.ConfigMapKeySelector `json:"scriptRunnerExecutionScriptConfigMap,omitempty"`
-
- // SetupRunnerExecutionScriptConfigMap allows the user to define a
- // custom terraform runner script that gets executed instead of the default
- // script built into the runner image. The configmap "name" and "key" are
- // required.
- SetupRunnerExecutionScriptConfigMap *corev1.ConfigMapKeySelector `json:"setupRunnerExecutionScriptConfigMap,omitempty"`
-
- // TerraformRunnerPullPolicy describes a policy for if/when to pull the
- // TerraformRunner image. Acceptable values are "Always", "Never", or
- // "IfNotPresent".
- TerraformRunnerPullPolicy corev1.PullPolicy `json:"terraformRunnerPullPolicy,omitempty"`
- ScriptRunnerPullPolicy corev1.PullPolicy `json:"scriptRunnerPullPolicy,omitempty"`
- SetupRunnerPullPolicy corev1.PullPolicy `json:"setupRunnerPullPolicy,omitempty"`
-
- // TerraformModule is the terraform module scm address. Currently supports
- // git protocol over SSH or HTTPS.
- //
- // Precedence of "terraformModule*" to use as the main module is
- // determined by the setup runner. See the runners/setup.sh for the
- // module configuration.
- TerraformModule string `json:"terraformModule,omitempty"`
-
- // TerraformModuleConfigMap is the configMap that contains terraform module
- // resources. The module will be fetched by the setup runner. In order
- // for terraform to understand it's a module reosurce, the configmap keys
- // must end in `.tf` or `.tf.json`.
- TerraformModuleConfigMap *ConfigMapSelector `json:"terraformModuleConfigMap,omitempty"`
-
- // TerraformModuleInline is an incline terraform module definition. The
- // contents of the inline definition will be used to create
- // `inline-module.tf`
- TerraformModuleInline string `json:"terraformModuleInline,omitempty"`
-
- // OutputsSecret will create a secret with the outputs from the module. All
- // outputs from the module will be written to the secret unless the user
- // defines "outputsToInclude" or "outputsToOmit".
- OutputsSecret string `json:"outputsSecret,omitempty"`
-
- // OutputsToInclude is a whitelist of outputs to write when writing the
- // outputs to kubernetes.
- OutputsToInclude []string `json:"outputsToInclude,omitempty"`
-
- // OutputsToOmit is a blacklist of outputs to omit when writing the
- // outputs to kubernetes.
- OutputsToOmit []string `json:"outputsToOmit,omitempty"`
-
- // WriteOutputsToStatus will add the outputs from the module to the status
- // of the Terraform CustomResource.
- WriteOutputsToStatus bool `json:"writeOutputsToStatus,omitempty"`
-
- // ResourceDownloads defines other files to download into the module
- // directory that can be used by the terraform workflow runners.
- // The `tfvar` type will also be fetched by the `exportRepo` option (if
- // defined) to aggregate the set of tfvars to save to an scm system.
- ResourceDownloads []*ResourceDownload `json:"resourceDownloads,omitempty"`
-
- // Env is used to define a common set of environment variables into the
- // workflow runners. The `TF_VAR_` prefix will also be used by the
- // `exportRepo` option.
- Env []corev1.EnvVar `json:"env,omitempty"`
-
- // ServiceAccount use a specific kubernetes ServiceAccount for running the create + destroy pods.
- // If not specified we create a new ServiceAccount per Terraform
- ServiceAccount string `json:"serviceAccount,omitempty"`
-
- // Credentials is an array of credentials generally used for Terraform
- // providers
- Credentials []Credentials `json:"credentials,omitempty"`
-
- // IgnoreDelete will bypass the finalization process and remove the tf
- // resource without running any delete jobs.
- IgnoreDelete bool `json:"ignoreDelete,omitempty"`
-
- // Reconcile are the settings used for auto-reconciliation
- Reconcile *ReconcileTerraformDeployment `json:"reconcile,omitempty"`
-
- // CustomBackend will allow the user to configure the backend of their
- // choice. If this is omitted, the default consul template will be used.
- CustomBackend string `json:"customBackend,omitempty"`
-
- // ExportRepo allows the user to define
- ExportRepo *ExportRepo `json:"exportRepo,omitempty"`
-
- // PreInitScript lets the user define a script that will run before
- // terraform commands are executed on the terraform-execution pod. The pod
- // will have already set up cloudProfile (eg cloud credentials) so the
- // script can make use of it.
- //
- // Setting this field will create a key in the tfvars configmap called
- // "prerun.sh". This means the user can also pass in a prerun.sh file via
- // config "Sources".
- PreInitScript string `json:"preInitScript,omitempty"`
- PostInitScript string `json:"postInitScript,omitempty"`
-
- PrePlanScript string `json:"prePlanScript,omitempty"`
- PostPlanScript string `json:"postPlanScript,omitempty"`
-
- PreApplyScript string `json:"preApplyScript,omitempty"`
-
- // PostApplyScript lets the user define a script that will run after
- // terraform commands are executed on the terraform-execution pod. The pod
- // will have already set up cloudProfile (eg cloud credentials) so the
- // script can make use of it.
- //
- // Setting this field will create a key in the tfvars configmap called
- // "postrun.sh". This means the user can alternatively pass in a
- // posterun.sh file via config "Sources".
- PostApplyScript string `json:"postApplyScript,omitempty"`
-
- PreInitDeleteScript string `json:"preInitDeleteScript,omitempty"`
- PostInitDeleteScript string `json:"postInitDeleteScript,omitempty"`
- PrePlanDeleteScript string `json:"prePlanDeleteScript,omitempty"`
- PostPlanDeleteScript string `json:"postPlanDeleteScript,omitempty"`
- PreApplyDeleteScript string `json:"preApplyDeleteScript,omitempty"`
- PostApplyDeleteScript string `json:"postApplyDeleteScript,omitempty"`
-
- // SSHTunnel can be defined for pulling from scm sources that cannot be
- // accessed by the network the operator/runner runs in. An example is
- // Enterprise Github servers running on a private network.
- SSHTunnel *ProxyOpts `json:"sshTunnel,omitempty"`
-
- // SCMAuthMethods define multiple SCMs that require tokens/keys
- SCMAuthMethods []SCMAuthMethod `json:"scmAuthMethods,omitempty"`
-}
-
-// A simple selector for configmaps that can select on the name of the configmap
-// with the optional key. The namespace is not an option since only runners
-// with a namespace'd role will utilize this map.
-type ConfigMapSelector struct {
- Name string `json:"name"`
- Key string `json:"key,omitempty"`
-}
-
-// SCMAuthMethod definition of SCMs that require tokens/keys
-type SCMAuthMethod struct {
- Host string `json:"host"`
-
- // Git configuration options for auth methods of git
- Git *GitSCM `json:"git,omitempty"`
-}
-
-// GitSCM define the auth methods of git
-type GitSCM struct {
- SSH *GitSSH `json:"ssh,omitempty"`
- HTTPS *GitHTTPS `json:"https,omitempty"`
-}
-
-// GitSSH configurs the setup for git over ssh with optional proxy
-type GitSSH struct {
- RequireProxy bool `json:"requireProxy,omitempty"`
- SSHKeySecretRef *SSHKeySecretRef `json:"sshKeySecretRef"`
-}
-
-// GitHTTPS configures the setup for git over https using tokens. Proxy is not
-// supported in the terraform job pod at this moment
-// TODO HTTPS Proxy support
-type GitHTTPS struct {
- RequireProxy bool `json:"requireProxy,omitempty"`
- TokenSecretRef *TokenSecretRef `json:"tokenSecretRef"`
-}
-
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-
-// TerraformList contains a list of Terraform
-type TerraformList struct {
- metav1.TypeMeta `json:",inline"`
- metav1.ListMeta `json:"metadata,omitempty"`
- Items []Terraform `json:"items"`
-}
-
-// ExportRepo is used to allow the tfvars passed into the job to also be
-// exported to a different git repo. The main use-case for this would be to
-// allow terraform execution outside of the terraform-operator for any reason
-type ExportRepo struct {
- // Address is the git repo to save to. At this time, only SSH is allowed
- Address string `json:"address"`
-
- // TFVarsFile is the full path relative to the root of the repo
- TFVarsFile string `json:"tfvarsFile,omitempty"`
-
- // ConfFile is the full path relative to the root of the repo
- ConfFile string `json:"confFile,omitempty"`
-
- // GitEmail is the email of the user who pushes to git. This email is
- // typically an automation user and probably the user whose token or sshkey
- // is configured in scmAuthMethod
- GitEmail string `json:"gitEmail,omitempty"`
-
- // GitUsername is the name of the user who pushes to git. This name is
- // typically an automation user and probably the user whose token or sshkey
- // is configured in scmAuthMethod
- GitUsername string `json:"gitUsername,omitempty"`
-
- // RetryOnFailure sets the export pod's restartPolicy to "OnFailure"
- RetryOnFailure bool `json:"retryOnFailure,omitempty"`
-}
-
-// ReconcileTerraformDeployment is used to configure auto watching the resources
-// created by terraform and re-applying them automatically if they are not
-// in-sync with the terraform state.
-type ReconcileTerraformDeployment struct {
- // Enable used to turn on the auto reconciliation of tfstate to actual
- // provisions. Default to false
- Enable bool `json:"enable"`
- // SyncPeriod can be used to set a custom time to check actual provisions
- // to tfstate. Defaults to 60 minutes
- SyncPeriod int64 `json:"syncPeriod,omitempty"`
-}
-
-// ResourceDownload (formerly SrcOpts) defines a resource to fetch using one
-// of the configured protocols: ssh|http|https (eg git::SSH or git::HTTPS)
-type ResourceDownload struct {
-
- // Address defines the source address resources to fetch.
- Address string `json:"address"`
-
- // Path will download the resources into this path which is relative to
- // the main module directory.
- Path string `json:"path,omitempty"`
-
- // UseAsVar will add the file as a tfvar via the -var-file flag of the
- // terraform plan command. The downloaded resource must not be a directory.
- UseAsVar bool `json:"useAsVar,omitempty"`
-}
-
-// ProxyOpts configures ssh tunnel/socks5 for downloading ssh/https resources
-type ProxyOpts struct {
- Host string `json:"host,omitempty"`
- User string `json:"user,omitempty"`
- SSHKeySecretRef SSHKeySecretRef `json:"sshKeySecretRef"`
-}
-
-// SSHKeySecretRef defines the secret where the SSH key (for the proxy, git, etc) is stored
-type SSHKeySecretRef struct {
- // Name the secret name that has the SSH key
- Name string `json:"name"`
- // Namespace of the secret; Default is the namespace of the terraform resource
- Namespace string `json:"namespace,omitempty"`
- // Key in the secret ref. Default to `id_rsa`
- Key string `json:"key,omitempty"`
-}
-
-// TokenSecretRef defines the token or password that can be used to log into a system (eg git)
-type TokenSecretRef struct {
- // Name the secret name that has the token or password
- Name string `json:"name"`
- // Namespace of the secret; Default is the namespace of the terraform resource
- Namespace string `json:"namespace,omitempty"`
- // Key in the secret ref. Default to `token`
- Key string `json:"key,omitempty"`
-}
-
-// Credentials are used for adding credentials for terraform providers.
-// For example, in AWS, the AWS Terraform Provider uses the default credential chain
-// of the AWS SDK, one of which are environment variables (eg AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY)
-type Credentials struct {
- // SecretNameRef will load environment variables into the terraform runner
- // from a kubernetes secret
- SecretNameRef SecretNameRef `json:"secretNameRef,omitempty"`
- // AWSCredentials contains the different methods to load AWS credentials
- // for the Terraform AWS Provider. If using AWS_ACCESS_KEY_ID and/or environment
- // variables for credentials, use fromEnvs.
- AWSCredentials AWSCredentials `json:"aws,omitempty"`
-
- // ServiceAccountAnnotations allows the service account to be annotated with
- // cloud IAM roles such as Workload Identity on GCP
- ServiceAccountAnnotations map[string]string `json:"serviceAccountAnnotations,omitempty"`
-
- // TODO Add other commonly used cloud providers to this list
-}
-
-// AWSCredentials provides a few different k8s-specific methods of adding
-// crednetials to pods. This includes KIAM and IRSA.
-//
-// To use environment variables, use a secretNameRef instead.
-type AWSCredentials struct {
- // IRSA requires the irsa role-arn as the string input. This will create a
- // serice account named tf-<resource-name>. In order for the pod to be able to
- // use this role, the "Trusted Entity" of the IAM role must allow this
- // serice account name and namespace.
- //
- // Using a TrustEntity policy that includes "StringEquals" setting it as the serivce account name
- // is the most secure way to use IRSA.
- //
- // However, for a reusable policy consider "StringLike" with a few wildcards to make
- // the irsa role usable by pods created by terraform-operator. The example below is
- // pretty liberal, but will work for any pod created by the terraform-operator.
- //
- // {
- // "Version": "2012-10-17",
- // "Statement": [
- // {
- // "Effect": "Allow",
- // "Principal": {
- // "Federated": "${OIDC_ARN}"
- // },
- // "Action": "sts:AssumeRoleWithWebIdentity",
- // "Condition": {
- // "StringLike": {
- // "${OIDC_URL}:sub": "system:serviceaccount:*:tf-*"
- // }
- // }
- // }
- // ]
- // }
- IRSA string `json:"irsa,omitempty"`
-
- // KIAM requires the kiam role-name as the string input. This will add the
- // correct annotation to the terraform execution pod
- KIAM string `json:"kiam,omitempty"`
-}
-
-// SecretNameRef is the name of the kubernetes secret to use
-type SecretNameRef struct {
- // Name of the secret
- Name string `json:"name"`
- // Namespace of the secret; Defaults to namespace of the tf resource
- Namespace string `json:"namespace,omitempty"`
- // Key of the secret
- Key string `json:"key,omitempty"`
-}
-
-// Inline definitions of configmaps
-type Inline struct {
- ConfigMapFiles map[string]string `json:"scripts"`
-}
-
-// TerraformStatus defines the observed state of Terraform
-// +k8s:openapi-gen=true
-type TerraformStatus struct {
- // INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
- // Important: Run "operator-sdk generate k8s" to regenerate code after modifying this file
- // Add custom validation using kubebuilder tags: https://book-v1.book.kubebuilder.io/beyond_basics/generating_crd.html
-
- // PodNamePrefix is used to identify this installation of the resource. For
- // very long resource names, like those greater than 220 characters, the
- // prefix ensures resource uniqueness for runners and other resources used
- // by the runner.
- // Another case for the pod name prefix is when rapidly deleteing a resource
- // and recreating it, the chance of recycling existing resources is reduced
- // to virtually nil.
- PodNamePrefix string `json:"podNamePrefix"`
- Phase StatusPhase `json:"phase"`
- LastCompletedGeneration int64 `json:"lastCompletedGeneration"`
- Outputs map[string]string `json:"outputs,omitempty"`
- Stages []Stage `json:"stages"`
- Exported Exported `json:"exported,omitempty"`
-}
-
-type Exported string
-
-const (
- ExportedTrue Exported = "true"
- ExportedFalse Exported = "false"
- ExportedInProgress Exported = "in-progress"
- ExportedFailed Exported = "failed"
- ExportedPending Exported = "pending"
- ExportCreating Exported = "creating"
-)
-
-type Stage struct {
- Generation int64 `json:"generation"`
- State StageState `json:"state"`
- PodType PodType `json:"podType"`
-
- // Interruptible is set to false when the pod should not be terminated
- // such as when doing a terraform apply
- Interruptible Interruptible `json:"interruptible"`
- Reason string `json:"reason"`
- StartTime metav1.Time `json:"startTime,omitempty"`
- StopTime metav1.Time `json:"stopTime,omitempty"`
-}
-
-type StatusPhase string
-
-const (
- PhaseInitializing StatusPhase = "initializing"
- PhaseCompleted StatusPhase = "completed"
- PhaseRunning StatusPhase = "running"
- PhaseInitDelete StatusPhase = "initializing-delete"
- PhaseDeleting StatusPhase = "deleting"
- PhaseDeleted StatusPhase = "deleted"
-)
-
-type PodType string
-
-const (
- PodSetupDelete PodType = "setup-delete"
- PodPreInitDelete PodType = "init0-delete"
- PodInitDelete PodType = "init-delete"
- PodPostInitDelete PodType = "init1-delete"
- PodPrePlanDelete PodType = "plan0-delete"
- PodPlanDelete PodType = "plan-delete"
- PodPostPlanDelete PodType = "plan1-delete"
- PodPreApplyDelete PodType = "apply0-delete"
- PodApplyDelete PodType = "apply-delete"
- PodPostApplyDelete PodType = "post-delete"
-
- PodSetup PodType = "setup"
- PodPreInit PodType = "init0"
- PodInit PodType = "init"
- PodPostInit PodType = "init1"
- PodPrePlan PodType = "plan0"
- PodPlan PodType = "plan"
- PodPostPlan PodType = "plan1"
- PodPreApply PodType = "apply0"
- PodApply PodType = "apply"
- PodPostApply PodType = "post"
- PodNil PodType = ""
-
- PodExport PodType = "export"
-)
-
-type StageState string
-
-const (
- StateInitializing StageState = "initializing"
- StateComplete StageState = "complete"
- StateFailed StageState = "failed"
- StateInProgress StageState = "in-progress"
- StateUnknown StageState = "unknown"
-)
-
-type Interruptible bool
-
-const (
- CanNotBeInterrupt Interruptible = false
- CanBeInterrupt Interruptible = true
-)
-
-func init() {
- SchemeBuilder.Register(&Terraform{}, &TerraformList{})
-}
diff --git a/pkg/apis/tf/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/tf/v1alpha1/zz_generated.deepcopy.go
deleted file mode 100644
index 3b5a911fa06958c23a120aa95143e3e24246112f..0000000000000000000000000000000000000000
--- a/pkg/apis/tf/v1alpha1/zz_generated.deepcopy.go
+++ /dev/null
@@ -1,518 +0,0 @@
-//go:build !ignore_autogenerated
-// +build !ignore_autogenerated
-
-/*
-Copyright isaaguilar.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by controller-gen. DO NOT EDIT.
-
-package v1alpha1
-
-import (
- corev1 "k8s.io/api/core/v1"
- "k8s.io/api/rbac/v1"
- runtime "k8s.io/apimachinery/pkg/runtime"
-)
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AWSCredentials) DeepCopyInto(out *AWSCredentials) {
- *out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSCredentials.
-func (in *AWSCredentials) DeepCopy() *AWSCredentials {
- if in == nil {
- return nil
- }
- out := new(AWSCredentials)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ConfigMapSelector) DeepCopyInto(out *ConfigMapSelector) {
- *out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConfigMapSelector.
-func (in *ConfigMapSelector) DeepCopy() *ConfigMapSelector {
- if in == nil {
- return nil
- }
- out := new(ConfigMapSelector)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Credentials) DeepCopyInto(out *Credentials) {
- *out = *in
- out.SecretNameRef = in.SecretNameRef
- out.AWSCredentials = in.AWSCredentials
- if in.ServiceAccountAnnotations != nil {
- in, out := &in.ServiceAccountAnnotations, &out.ServiceAccountAnnotations
- *out = make(map[string]string, len(*in))
- for key, val := range *in {
- (*out)[key] = val
- }
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Credentials.
-func (in *Credentials) DeepCopy() *Credentials {
- if in == nil {
- return nil
- }
- out := new(Credentials)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ExportRepo) DeepCopyInto(out *ExportRepo) {
- *out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExportRepo.
-func (in *ExportRepo) DeepCopy() *ExportRepo {
- if in == nil {
- return nil
- }
- out := new(ExportRepo)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *GitHTTPS) DeepCopyInto(out *GitHTTPS) {
- *out = *in
- if in.TokenSecretRef != nil {
- in, out := &in.TokenSecretRef, &out.TokenSecretRef
- *out = new(TokenSecretRef)
- **out = **in
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GitHTTPS.
-func (in *GitHTTPS) DeepCopy() *GitHTTPS {
- if in == nil {
- return nil
- }
- out := new(GitHTTPS)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *GitSCM) DeepCopyInto(out *GitSCM) {
- *out = *in
- if in.SSH != nil {
- in, out := &in.SSH, &out.SSH
- *out = new(GitSSH)
- (*in).DeepCopyInto(*out)
- }
- if in.HTTPS != nil {
- in, out := &in.HTTPS, &out.HTTPS
- *out = new(GitHTTPS)
- (*in).DeepCopyInto(*out)
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GitSCM.
-func (in *GitSCM) DeepCopy() *GitSCM {
- if in == nil {
- return nil
- }
- out := new(GitSCM)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *GitSSH) DeepCopyInto(out *GitSSH) {
- *out = *in
- if in.SSHKeySecretRef != nil {
- in, out := &in.SSHKeySecretRef, &out.SSHKeySecretRef
- *out = new(SSHKeySecretRef)
- **out = **in
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GitSSH.
-func (in *GitSSH) DeepCopy() *GitSSH {
- if in == nil {
- return nil
- }
- out := new(GitSSH)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Inline) DeepCopyInto(out *Inline) {
- *out = *in
- if in.ConfigMapFiles != nil {
- in, out := &in.ConfigMapFiles, &out.ConfigMapFiles
- *out = make(map[string]string, len(*in))
- for key, val := range *in {
- (*out)[key] = val
- }
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Inline.
-func (in *Inline) DeepCopy() *Inline {
- if in == nil {
- return nil
- }
- out := new(Inline)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ProxyOpts) DeepCopyInto(out *ProxyOpts) {
- *out = *in
- out.SSHKeySecretRef = in.SSHKeySecretRef
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProxyOpts.
-func (in *ProxyOpts) DeepCopy() *ProxyOpts {
- if in == nil {
- return nil
- }
- out := new(ProxyOpts)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ReconcileTerraformDeployment) DeepCopyInto(out *ReconcileTerraformDeployment) {
- *out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ReconcileTerraformDeployment.
-func (in *ReconcileTerraformDeployment) DeepCopy() *ReconcileTerraformDeployment {
- if in == nil {
- return nil
- }
- out := new(ReconcileTerraformDeployment)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ResourceDownload) DeepCopyInto(out *ResourceDownload) {
- *out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourceDownload.
-func (in *ResourceDownload) DeepCopy() *ResourceDownload {
- if in == nil {
- return nil
- }
- out := new(ResourceDownload)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SCMAuthMethod) DeepCopyInto(out *SCMAuthMethod) {
- *out = *in
- if in.Git != nil {
- in, out := &in.Git, &out.Git
- *out = new(GitSCM)
- (*in).DeepCopyInto(*out)
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SCMAuthMethod.
-func (in *SCMAuthMethod) DeepCopy() *SCMAuthMethod {
- if in == nil {
- return nil
- }
- out := new(SCMAuthMethod)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SSHKeySecretRef) DeepCopyInto(out *SSHKeySecretRef) {
- *out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SSHKeySecretRef.
-func (in *SSHKeySecretRef) DeepCopy() *SSHKeySecretRef {
- if in == nil {
- return nil
- }
- out := new(SSHKeySecretRef)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *SecretNameRef) DeepCopyInto(out *SecretNameRef) {
- *out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SecretNameRef.
-func (in *SecretNameRef) DeepCopy() *SecretNameRef {
- if in == nil {
- return nil
- }
- out := new(SecretNameRef)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Stage) DeepCopyInto(out *Stage) {
- *out = *in
- in.StartTime.DeepCopyInto(&out.StartTime)
- in.StopTime.DeepCopyInto(&out.StopTime)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Stage.
-func (in *Stage) DeepCopy() *Stage {
- if in == nil {
- return nil
- }
- out := new(Stage)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *Terraform) DeepCopyInto(out *Terraform) {
- *out = *in
- out.TypeMeta = in.TypeMeta
- in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
- in.Spec.DeepCopyInto(&out.Spec)
- in.Status.DeepCopyInto(&out.Status)
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Terraform.
-func (in *Terraform) DeepCopy() *Terraform {
- if in == nil {
- return nil
- }
- out := new(Terraform)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *Terraform) DeepCopyObject() runtime.Object {
- if c := in.DeepCopy(); c != nil {
- return c
- }
- return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TerraformList) DeepCopyInto(out *TerraformList) {
- *out = *in
- out.TypeMeta = in.TypeMeta
- in.ListMeta.DeepCopyInto(&out.ListMeta)
- if in.Items != nil {
- in, out := &in.Items, &out.Items
- *out = make([]Terraform, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TerraformList.
-func (in *TerraformList) DeepCopy() *TerraformList {
- if in == nil {
- return nil
- }
- out := new(TerraformList)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *TerraformList) DeepCopyObject() runtime.Object {
- if c := in.DeepCopy(); c != nil {
- return c
- }
- return nil
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TerraformSpec) DeepCopyInto(out *TerraformSpec) {
- *out = *in
- if in.PersistentVolumeSize != nil {
- in, out := &in.PersistentVolumeSize, &out.PersistentVolumeSize
- x := (*in).DeepCopy()
- *out = &x
- }
- if in.RunnerRules != nil {
- in, out := &in.RunnerRules, &out.RunnerRules
- *out = make([]v1.PolicyRule, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
- if in.RunnerAnnotations != nil {
- in, out := &in.RunnerAnnotations, &out.RunnerAnnotations
- *out = make(map[string]string, len(*in))
- for key, val := range *in {
- (*out)[key] = val
- }
- }
- if in.RunnerLabels != nil {
- in, out := &in.RunnerLabels, &out.RunnerLabels
- *out = make(map[string]string, len(*in))
- for key, val := range *in {
- (*out)[key] = val
- }
- }
- if in.TerraformRunnerExecutionScriptConfigMap != nil {
- in, out := &in.TerraformRunnerExecutionScriptConfigMap, &out.TerraformRunnerExecutionScriptConfigMap
- *out = new(corev1.ConfigMapKeySelector)
- (*in).DeepCopyInto(*out)
- }
- if in.ScriptRunnerExecutionScriptConfigMap != nil {
- in, out := &in.ScriptRunnerExecutionScriptConfigMap, &out.ScriptRunnerExecutionScriptConfigMap
- *out = new(corev1.ConfigMapKeySelector)
- (*in).DeepCopyInto(*out)
- }
- if in.SetupRunnerExecutionScriptConfigMap != nil {
- in, out := &in.SetupRunnerExecutionScriptConfigMap, &out.SetupRunnerExecutionScriptConfigMap
- *out = new(corev1.ConfigMapKeySelector)
- (*in).DeepCopyInto(*out)
- }
- if in.TerraformModuleConfigMap != nil {
- in, out := &in.TerraformModuleConfigMap, &out.TerraformModuleConfigMap
- *out = new(ConfigMapSelector)
- **out = **in
- }
- if in.OutputsToInclude != nil {
- in, out := &in.OutputsToInclude, &out.OutputsToInclude
- *out = make([]string, len(*in))
- copy(*out, *in)
- }
- if in.OutputsToOmit != nil {
- in, out := &in.OutputsToOmit, &out.OutputsToOmit
- *out = make([]string, len(*in))
- copy(*out, *in)
- }
- if in.ResourceDownloads != nil {
- in, out := &in.ResourceDownloads, &out.ResourceDownloads
- *out = make([]*ResourceDownload, len(*in))
- for i := range *in {
- if (*in)[i] != nil {
- in, out := &(*in)[i], &(*out)[i]
- *out = new(ResourceDownload)
- **out = **in
- }
- }
- }
- if in.Env != nil {
- in, out := &in.Env, &out.Env
- *out = make([]corev1.EnvVar, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
- if in.Credentials != nil {
- in, out := &in.Credentials, &out.Credentials
- *out = make([]Credentials, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
- if in.Reconcile != nil {
- in, out := &in.Reconcile, &out.Reconcile
- *out = new(ReconcileTerraformDeployment)
- **out = **in
- }
- if in.ExportRepo != nil {
- in, out := &in.ExportRepo, &out.ExportRepo
- *out = new(ExportRepo)
- **out = **in
- }
- if in.SSHTunnel != nil {
- in, out := &in.SSHTunnel, &out.SSHTunnel
- *out = new(ProxyOpts)
- **out = **in
- }
- if in.SCMAuthMethods != nil {
- in, out := &in.SCMAuthMethods, &out.SCMAuthMethods
- *out = make([]SCMAuthMethod, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TerraformSpec.
-func (in *TerraformSpec) DeepCopy() *TerraformSpec {
- if in == nil {
- return nil
- }
- out := new(TerraformSpec)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TerraformStatus) DeepCopyInto(out *TerraformStatus) {
- *out = *in
- if in.Outputs != nil {
- in, out := &in.Outputs, &out.Outputs
- *out = make(map[string]string, len(*in))
- for key, val := range *in {
- (*out)[key] = val
- }
- }
- if in.Stages != nil {
- in, out := &in.Stages, &out.Stages
- *out = make([]Stage, len(*in))
- for i := range *in {
- (*in)[i].DeepCopyInto(&(*out)[i])
- }
- }
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TerraformStatus.
-func (in *TerraformStatus) DeepCopy() *TerraformStatus {
- if in == nil {
- return nil
- }
- out := new(TerraformStatus)
- in.DeepCopyInto(out)
- return out
-}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *TokenSecretRef) DeepCopyInto(out *TokenSecretRef) {
- *out = *in
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new TokenSecretRef.
-func (in *TokenSecretRef) DeepCopy() *TokenSecretRef {
- if in == nil {
- return nil
- }
- out := new(TokenSecretRef)
- in.DeepCopyInto(out)
- return out
-}
diff --git a/pkg/apis/tf/v1alpha1/zz_generated.openapi.go b/pkg/apis/tf/v1alpha1/zz_generated.openapi.go
deleted file mode 100644
index d8084ddabe6d16de04b91b9c6dd1231190f63e9e..0000000000000000000000000000000000000000
--- a/pkg/apis/tf/v1alpha1/zz_generated.openapi.go
+++ /dev/null
@@ -1,551 +0,0 @@
-//go:build !ignore_autogenerated
-// +build !ignore_autogenerated
-
-/*
-Copyright isaaguilar.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by openapi-gen. DO NOT EDIT.
-
-// This file was autogenerated by openapi-gen. Do not edit it manually!
-
-package v1alpha1
-
-import (
- common "k8s.io/kube-openapi/pkg/common"
- spec "k8s.io/kube-openapi/pkg/validation/spec"
-)
-
-func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
- return map[string]common.OpenAPIDefinition{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.Terraform": schema_pkg_apis_tf_v1alpha1_Terraform(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.TerraformSpec": schema_pkg_apis_tf_v1alpha1_TerraformSpec(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.TerraformStatus": schema_pkg_apis_tf_v1alpha1_TerraformStatus(ref),
- }
-}
-
-func schema_pkg_apis_tf_v1alpha1_Terraform(ref common.ReferenceCallback) common.OpenAPIDefinition {
- return common.OpenAPIDefinition{
- Schema: spec.Schema{
- SchemaProps: spec.SchemaProps{
- Description: "Terraform is the Schema for the terraforms API",
- Type: []string{"object"},
- Properties: map[string]spec.Schema{
- "kind": {
- SchemaProps: spec.SchemaProps{
- Description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
- Type: []string{"string"},
- Format: "",
- },
- },
- "apiVersion": {
- SchemaProps: spec.SchemaProps{
- Description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources",
- Type: []string{"string"},
- Format: "",
- },
- },
- "metadata": {
- SchemaProps: spec.SchemaProps{
- Default: map[string]interface{}{},
- Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"),
- },
- },
- "spec": {
- SchemaProps: spec.SchemaProps{
- Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.TerraformSpec"),
- },
- },
- "status": {
- SchemaProps: spec.SchemaProps{
- Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.TerraformStatus"),
- },
- },
- },
- },
- },
- Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.TerraformSpec", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.TerraformStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
- }
-}
-
-func schema_pkg_apis_tf_v1alpha1_TerraformSpec(ref common.ReferenceCallback) common.OpenAPIDefinition {
- return common.OpenAPIDefinition{
- Schema: spec.Schema{
- SchemaProps: spec.SchemaProps{
- Description: "TerraformSpec defines the desired state of Terraform",
- Type: []string{"object"},
- Properties: map[string]spec.Schema{
- "keepLatestPodsOnly": {
- SchemaProps: spec.SchemaProps{
- Description: "KeepLatestPodsOnly when true will keep only the pods that match the current generation of the terraform k8s-resource. This overrides the behavior of `keepCompletedPods`.",
- Type: []string{"boolean"},
- Format: "",
- },
- },
- "keepCompletedPods": {
- SchemaProps: spec.SchemaProps{
- Description: "KeepCompletedPods when true will keep completed pods. Default is false and completed pods are removed.",
- Type: []string{"boolean"},
- Format: "",
- },
- },
- "cleanupDisk": {
- SchemaProps: spec.SchemaProps{
- Description: "CleanupDisk will clear out previous terraform run data from the persistent volume.",
- Type: []string{"boolean"},
- Format: "",
- },
- },
- "persistentVolumeSize": {
- SchemaProps: spec.SchemaProps{
- Description: "PersistentVolumeSize define the size of the disk used to store terraform run data. If not defined, a default of \"2Gi\" is used.",
- Ref: ref("k8s.io/apimachinery/pkg/api/resource.Quantity"),
- },
- },
- "runnerRules": {
- SchemaProps: spec.SchemaProps{
- Description: "RunnerRules are RBAC rules that will be added to all runner pods.",
- Type: []string{"array"},
- Items: &spec.SchemaOrArray{
- Schema: &spec.Schema{
- SchemaProps: spec.SchemaProps{
- Default: map[string]interface{}{},
- Ref: ref("k8s.io/api/rbac/v1.PolicyRule"),
- },
- },
- },
- },
- },
- "runnerAnnotations": {
- SchemaProps: spec.SchemaProps{
- Description: "RunnerAnnotations are annotations that will be added to all runner pods.",
- Type: []string{"object"},
- AdditionalProperties: &spec.SchemaOrBool{
- Allows: true,
- Schema: &spec.Schema{
- SchemaProps: spec.SchemaProps{
- Default: "",
- Type: []string{"string"},
- Format: "",
- },
- },
- },
- },
- },
- "runnerLabels": {
- SchemaProps: spec.SchemaProps{
- Description: "RunnerLabels key/value pairs that will be added as labels to runner pods",
- Type: []string{"object"},
- AdditionalProperties: &spec.SchemaOrBool{
- Allows: true,
- Schema: &spec.Schema{
- SchemaProps: spec.SchemaProps{
- Default: "",
- Type: []string{"string"},
- Format: "",
- },
- },
- },
- },
- },
- "terraformVersion": {
- SchemaProps: spec.SchemaProps{
- Description: "TerraformVersion helps the operator decide which image tag to pull for the terraform runner. Defaults to \"0.11.14\"",
- Type: []string{"string"},
- Format: "",
- },
- },
- "scriptRunnerVersion": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "setupRunnerVersion": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "terraformRunner": {
- SchemaProps: spec.SchemaProps{
- Description: "TerraformRunner gives the user the ability to inject their own container image to execute terraform. This is very helpful for users who need to have a certain toolset installed on their images, or who can't pull public images, such as the default image \"isaaguilar/tfops\".",
- Type: []string{"string"},
- Format: "",
- },
- },
- "scriptRunner": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "setupRunner": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "terraformRunnerExecutionScriptConfigMap": {
- SchemaProps: spec.SchemaProps{
- Description: "TerraformRunnerExecutionScriptConfigMap allows the user to define a custom terraform runner script that gets executed instead of the default script built into the runner image. The configmap \"name\" and \"key\" are required.",
- Ref: ref("k8s.io/api/core/v1.ConfigMapKeySelector"),
- },
- },
- "scriptRunnerExecutionScriptConfigMap": {
- SchemaProps: spec.SchemaProps{
- Description: "ScriptRunnerExecutionScriptConfigMap allows the user to define a custom terraform runner script that gets executed instead of the default script built into the runner image. The configmap \"name\" and \"key\" are required.",
- Ref: ref("k8s.io/api/core/v1.ConfigMapKeySelector"),
- },
- },
- "setupRunnerExecutionScriptConfigMap": {
- SchemaProps: spec.SchemaProps{
- Description: "SetupRunnerExecutionScriptConfigMap allows the user to define a custom terraform runner script that gets executed instead of the default script built into the runner image. The configmap \"name\" and \"key\" are required.",
- Ref: ref("k8s.io/api/core/v1.ConfigMapKeySelector"),
- },
- },
- "terraformRunnerPullPolicy": {
- SchemaProps: spec.SchemaProps{
- Description: "TerraformRunnerPullPolicy describes a policy for if/when to pull the TerraformRunner image. Acceptable values are \"Always\", \"Never\", or \"IfNotPresent\".",
- Type: []string{"string"},
- Format: "",
- },
- },
- "scriptRunnerPullPolicy": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "setupRunnerPullPolicy": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "terraformModule": {
- SchemaProps: spec.SchemaProps{
- Description: "TerraformModule is the terraform module scm address. Currently supports git protocol over SSH or HTTPS.\n\nPrecedence of \"terraformModule*\" to use as the main module is determined by the setup runner. See the runners/setup.sh for the module configuration.",
- Type: []string{"string"},
- Format: "",
- },
- },
- "terraformModuleConfigMap": {
- SchemaProps: spec.SchemaProps{
- Description: "TerraformModuleConfigMap is the configMap that contains terraform module resources. The module will be fetched by the setup runner. In order for terraform to understand it's a module reosurce, the configmap keys must end in `.tf` or `.tf.json`.",
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.ConfigMapSelector"),
- },
- },
- "terraformModuleInline": {
- SchemaProps: spec.SchemaProps{
- Description: "TerraformModuleInline is an incline terraform module definition. The contents of the inline definition will be used to create `inline-module.tf`",
- Type: []string{"string"},
- Format: "",
- },
- },
- "outputsSecret": {
- SchemaProps: spec.SchemaProps{
- Description: "OutputsSecret will create a secret with the outputs from the module. All outputs from the module will be written to the secret unless the user defines \"outputsToInclude\" or \"outputsToOmit\".",
- Type: []string{"string"},
- Format: "",
- },
- },
- "outputsToInclude": {
- SchemaProps: spec.SchemaProps{
- Description: "OutputsToInclude is a whitelist of outputs to write when writing the outputs to kubernetes.",
- Type: []string{"array"},
- Items: &spec.SchemaOrArray{
- Schema: &spec.Schema{
- SchemaProps: spec.SchemaProps{
- Default: "",
- Type: []string{"string"},
- Format: "",
- },
- },
- },
- },
- },
- "outputsToOmit": {
- SchemaProps: spec.SchemaProps{
- Description: "OutputsToOmit is a blacklist of outputs to omit when writing the outputs to kubernetes.",
- Type: []string{"array"},
- Items: &spec.SchemaOrArray{
- Schema: &spec.Schema{
- SchemaProps: spec.SchemaProps{
- Default: "",
- Type: []string{"string"},
- Format: "",
- },
- },
- },
- },
- },
- "writeOutputsToStatus": {
- SchemaProps: spec.SchemaProps{
- Description: "WriteOutputsToStatus will add the outputs from the module to the status of the Terraform CustomResource.",
- Type: []string{"boolean"},
- Format: "",
- },
- },
- "resourceDownloads": {
- SchemaProps: spec.SchemaProps{
- Description: "ResourceDownloads defines other files to download into the module directory that can be used by the terraform workflow runners. The `tfvar` type will also be fetched by the `exportRepo` option (if defined) to aggregate the set of tfvars to save to an scm system.",
- Type: []string{"array"},
- Items: &spec.SchemaOrArray{
- Schema: &spec.Schema{
- SchemaProps: spec.SchemaProps{
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.ResourceDownload"),
- },
- },
- },
- },
- },
- "env": {
- SchemaProps: spec.SchemaProps{
- Description: "Env is used to define a common set of environment variables into the workflow runners. The `TF_VAR_` prefix will also be used by the `exportRepo` option.",
- Type: []string{"array"},
- Items: &spec.SchemaOrArray{
- Schema: &spec.Schema{
- SchemaProps: spec.SchemaProps{
- Default: map[string]interface{}{},
- Ref: ref("k8s.io/api/core/v1.EnvVar"),
- },
- },
- },
- },
- },
- "serviceAccount": {
- SchemaProps: spec.SchemaProps{
- Description: "ServiceAccount use a specific kubernetes ServiceAccount for running the create + destroy pods. If not specified we create a new ServiceAccount per Terraform",
- Type: []string{"string"},
- Format: "",
- },
- },
- "credentials": {
- SchemaProps: spec.SchemaProps{
- Description: "Credentials is an array of credentials generally used for Terraform providers",
- Type: []string{"array"},
- Items: &spec.SchemaOrArray{
- Schema: &spec.Schema{
- SchemaProps: spec.SchemaProps{
- Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.Credentials"),
- },
- },
- },
- },
- },
- "ignoreDelete": {
- SchemaProps: spec.SchemaProps{
- Description: "IgnoreDelete will bypass the finalization process and remove the tf resource without running any delete jobs.",
- Type: []string{"boolean"},
- Format: "",
- },
- },
- "reconcile": {
- SchemaProps: spec.SchemaProps{
- Description: "Reconcile are the settings used for auto-reconciliation",
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.ReconcileTerraformDeployment"),
- },
- },
- "customBackend": {
- SchemaProps: spec.SchemaProps{
- Description: "CustomBackend will allow the user to configure the backend of their choice. If this is omitted, the default consul template will be used.",
- Type: []string{"string"},
- Format: "",
- },
- },
- "exportRepo": {
- SchemaProps: spec.SchemaProps{
- Description: "ExportRepo allows the user to define",
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.ExportRepo"),
- },
- },
- "preInitScript": {
- SchemaProps: spec.SchemaProps{
- Description: "PreInitScript lets the user define a script that will run before terraform commands are executed on the terraform-execution pod. The pod will have already set up cloudProfile (eg cloud credentials) so the script can make use of it.\n\nSetting this field will create a key in the tfvars configmap called \"prerun.sh\". This means the user can also pass in a prerun.sh file via config \"Sources\".",
- Type: []string{"string"},
- Format: "",
- },
- },
- "postInitScript": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "prePlanScript": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "postPlanScript": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "preApplyScript": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "postApplyScript": {
- SchemaProps: spec.SchemaProps{
- Description: "PostApplyScript lets the user define a script that will run after terraform commands are executed on the terraform-execution pod. The pod will have already set up cloudProfile (eg cloud credentials) so the script can make use of it.\n\nSetting this field will create a key in the tfvars configmap called \"postrun.sh\". This means the user can alternatively pass in a posterun.sh file via config \"Sources\".",
- Type: []string{"string"},
- Format: "",
- },
- },
- "preInitDeleteScript": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "postInitDeleteScript": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "prePlanDeleteScript": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "postPlanDeleteScript": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "preApplyDeleteScript": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "postApplyDeleteScript": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- "sshTunnel": {
- SchemaProps: spec.SchemaProps{
- Description: "SSHTunnel can be defined for pulling from scm sources that cannot be accessed by the network the operator/runner runs in. An example is Enterprise Github servers running on a private network.",
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.ProxyOpts"),
- },
- },
- "scmAuthMethods": {
- SchemaProps: spec.SchemaProps{
- Description: "SCMAuthMethods define multiple SCMs that require tokens/keys",
- Type: []string{"array"},
- Items: &spec.SchemaOrArray{
- Schema: &spec.Schema{
- SchemaProps: spec.SchemaProps{
- Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.SCMAuthMethod"),
- },
- },
- },
- },
- },
- },
- },
- },
- Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.ConfigMapSelector", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.Credentials", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.ExportRepo", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.ProxyOpts", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.ReconcileTerraformDeployment", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.ResourceDownload", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.SCMAuthMethod", "k8s.io/api/core/v1.ConfigMapKeySelector", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/rbac/v1.PolicyRule", "k8s.io/apimachinery/pkg/api/resource.Quantity"},
- }
-}
-
-func schema_pkg_apis_tf_v1alpha1_TerraformStatus(ref common.ReferenceCallback) common.OpenAPIDefinition {
- return common.OpenAPIDefinition{
- Schema: spec.Schema{
- SchemaProps: spec.SchemaProps{
- Description: "TerraformStatus defines the observed state of Terraform",
- Type: []string{"object"},
- Properties: map[string]spec.Schema{
- "podNamePrefix": {
- SchemaProps: spec.SchemaProps{
- Description: "PodNamePrefix is used to identify this installation of the resource. For very long resource names, like those greater than 220 characters, the prefix ensures resource uniqueness for runners and other resources used by the runner. Another case for the pod name prefix is when rapidly deleteing a resource and recreating it, the chance of recycling existing resources is reduced to virtually nil.",
- Default: "",
- Type: []string{"string"},
- Format: "",
- },
- },
- "phase": {
- SchemaProps: spec.SchemaProps{
- Default: "",
- Type: []string{"string"},
- Format: "",
- },
- },
- "lastCompletedGeneration": {
- SchemaProps: spec.SchemaProps{
- Default: 0,
- Type: []string{"integer"},
- Format: "int64",
- },
- },
- "outputs": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"object"},
- AdditionalProperties: &spec.SchemaOrBool{
- Allows: true,
- Schema: &spec.Schema{
- SchemaProps: spec.SchemaProps{
- Default: "",
- Type: []string{"string"},
- Format: "",
- },
- },
- },
- },
- },
- "stages": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"array"},
- Items: &spec.SchemaOrArray{
- Schema: &spec.Schema{
- SchemaProps: spec.SchemaProps{
- Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.Stage"),
- },
- },
- },
- },
- },
- "exported": {
- SchemaProps: spec.SchemaProps{
- Type: []string{"string"},
- Format: "",
- },
- },
- },
- Required: []string{"podNamePrefix", "phase", "lastCompletedGeneration", "stages"},
- },
- },
- Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1.Stage"},
- }
-}
diff --git a/pkg/apis/tf/v1alpha2/register.go b/pkg/apis/tf/v1alpha2/register.go
deleted file mode 100644
index 6743dc8116ab5b8a36073d38931acc9fbbef53eb..0000000000000000000000000000000000000000
--- a/pkg/apis/tf/v1alpha2/register.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// NOTE: Boilerplate only. Ignore this file.
-
-// Package v1alpha2 contains API Schema definitions for the tf v1alpha2 API group
-// +k8s:deepcopy-gen=package,register
-// +groupName=tf.isaaguilar.com
-package v1alpha2
-
-import (
- "k8s.io/apimachinery/pkg/runtime/schema"
- "sigs.k8s.io/controller-runtime/pkg/scheme"
-)
-
-var (
- // SchemeGroupVersion is group version used to register these objects
- SchemeGroupVersion = schema.GroupVersion{Group: "tf.isaaguilar.com", Version: "v1alpha2"}
-
- // SchemeBuilder is used to add go types to the GroupVersionKind scheme
- SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
-
- // AddToScheme adds the types in this group-version to the given scheme.
- AddToScheme = SchemeBuilder.AddToScheme
-)
diff --git a/pkg/apis/tf/v1alpha2/doc.go b/pkg/apis/tf/v1beta1/doc.go
similarity index 95%
rename from pkg/apis/tf/v1alpha2/doc.go
rename to pkg/apis/tf/v1beta1/doc.go
index 3650e1054c957bb64b61cdbd85d1f290e5ae426f..d18f0b5ad7cc176666ae0c9c4fc5baa731076136 100644
--- a/pkg/apis/tf/v1alpha2/doc.go
+++ b/pkg/apis/tf/v1beta1/doc.go
@@ -1,7 +1,7 @@
-// Package v1alpha2 contains API Schema definitions for the tf v1alpha2 API group
+// Package v1beta1 contains API Schema definitions for the tf v1beta1 API group
// +k8s:deepcopy-gen=package,register
-// +groupName=tf.isaaguilar.com
-package v1alpha2
+// +groupName=tf.galleybytes.com
+package v1beta1
import (
"bytes"
@@ -16,7 +16,7 @@ import (
"k8s.io/kube-openapi/pkg/validation/spec"
)
-var pkgpath = "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2"
+var pkgpath = "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1"
// +kubebuilder:object:generate=false
type Definition struct {
diff --git a/pkg/apis/tf/v1alpha2/helpers.go b/pkg/apis/tf/v1beta1/helpers.go
similarity index 95%
rename from pkg/apis/tf/v1alpha2/helpers.go
rename to pkg/apis/tf/v1beta1/helpers.go
index b1e49f75e33a5be17cb8dccecc1a00fbb03cfd15..29b8c16494404bb8a1ada187b3576876ef305f1c 100644
--- a/pkg/apis/tf/v1alpha2/helpers.go
+++ b/pkg/apis/tf/v1beta1/helpers.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
func ListContainsTask(list []TaskName, item TaskName) bool {
for _, i := range list {
diff --git a/pkg/apis/tf/v1alpha1/register.go b/pkg/apis/tf/v1beta1/register.go
similarity index 70%
rename from pkg/apis/tf/v1alpha1/register.go
rename to pkg/apis/tf/v1beta1/register.go
index affe2a37d304e4b5232fae4a57d2462e38d64cb2..1380149b2a260f6650d2a9ae5be65b3ceabca84b 100644
--- a/pkg/apis/tf/v1alpha1/register.go
+++ b/pkg/apis/tf/v1beta1/register.go
@@ -1,9 +1,9 @@
// NOTE: Boilerplate only. Ignore this file.
-// Package v1alpha1 contains API Schema definitions for the tf v1alpha1 API group
+// Package v1beta1 contains API Schema definitions for the tf v1beta1 API group
// +k8s:deepcopy-gen=package,register
-// +groupName=tf.isaaguilar.com
-package v1alpha1
+// +groupName=tf.galleybytes.com
+package v1beta1
import (
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -12,7 +12,7 @@ import (
var (
// SchemeGroupVersion is group version used to register these objects
- SchemeGroupVersion = schema.GroupVersion{Group: "tf.isaaguilar.com", Version: "v1alpha1"}
+ SchemeGroupVersion = schema.GroupVersion{Group: "tf.galleybytes.com", Version: "v1beta1"}
// SchemeBuilder is used to add go types to the GroupVersionKind scheme
SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
diff --git a/pkg/apis/tf/v1alpha2/terraform_types.go b/pkg/apis/tf/v1beta1/terraform_types.go
similarity index 99%
rename from pkg/apis/tf/v1alpha2/terraform_types.go
rename to pkg/apis/tf/v1beta1/terraform_types.go
index 522ae46ef4f46e47c2b9e05aaddaf7333e6b6f79..bfb9bd68852fd0dd9d9fe1ea47bd7d57181092d7 100644
--- a/pkg/apis/tf/v1alpha2/terraform_types.go
+++ b/pkg/apis/tf/v1beta1/terraform_types.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
import (
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/apis/tf/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/tf/v1beta1/zz_generated.deepcopy.go
similarity index 99%
rename from pkg/apis/tf/v1alpha2/zz_generated.deepcopy.go
rename to pkg/apis/tf/v1beta1/zz_generated.deepcopy.go
index 675da1a96a7656e197bb360b60b423508c2baa96..075e939ffaafa4b10d0a5078abf1c2c9ee3b4cc9 100644
--- a/pkg/apis/tf/v1alpha2/zz_generated.deepcopy.go
+++ b/pkg/apis/tf/v1beta1/zz_generated.deepcopy.go
@@ -19,7 +19,7 @@ limitations under the License.
// Code generated by controller-gen. DO NOT EDIT.
-package v1alpha2
+package v1beta1
import (
corev1 "k8s.io/api/core/v1"
diff --git a/pkg/apis/tf/v1alpha2/zz_generated.openapi.go b/pkg/apis/tf/v1beta1/zz_generated.openapi.go
similarity index 81%
rename from pkg/apis/tf/v1alpha2/zz_generated.openapi.go
rename to pkg/apis/tf/v1beta1/zz_generated.openapi.go
index 612e74dd15cb31086db42bfe2e62da72ac47b991..106fda4a8273835fe9f85d43ed3d147cf72dab6b 100644
--- a/pkg/apis/tf/v1alpha2/zz_generated.openapi.go
+++ b/pkg/apis/tf/v1beta1/zz_generated.openapi.go
@@ -21,7 +21,7 @@ limitations under the License.
// This file was autogenerated by openapi-gen. Do not edit it manually!
-package v1alpha2
+package v1beta1
import (
common "k8s.io/kube-openapi/pkg/common"
@@ -30,33 +30,33 @@ import (
func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenAPIDefinition {
return map[string]common.OpenAPIDefinition{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.AWSCredentials": schema_pkg_apis_tf_v1alpha2_AWSCredentials(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ConfigMapSelector": schema_pkg_apis_tf_v1alpha2_ConfigMapSelector(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Credentials": schema_pkg_apis_tf_v1alpha2_Credentials(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.GitHTTPS": schema_pkg_apis_tf_v1alpha2_GitHTTPS(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.GitSCM": schema_pkg_apis_tf_v1alpha2_GitSCM(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.GitSSH": schema_pkg_apis_tf_v1alpha2_GitSSH(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ImageConfig": schema_pkg_apis_tf_v1alpha2_ImageConfig(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Images": schema_pkg_apis_tf_v1alpha2_Images(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Module": schema_pkg_apis_tf_v1alpha2_Module(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Plugin": schema_pkg_apis_tf_v1alpha2_Plugin(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ProxyOpts": schema_pkg_apis_tf_v1alpha2_ProxyOpts(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ResourceDownload": schema_pkg_apis_tf_v1alpha2_ResourceDownload(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.SCMAuthMethod": schema_pkg_apis_tf_v1alpha2_SCMAuthMethod(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.SSHKeySecretRef": schema_pkg_apis_tf_v1alpha2_SSHKeySecretRef(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.SecretNameRef": schema_pkg_apis_tf_v1alpha2_SecretNameRef(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Setup": schema_pkg_apis_tf_v1alpha2_Setup(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Stage": schema_pkg_apis_tf_v1alpha2_Stage(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.StageScript": schema_pkg_apis_tf_v1alpha2_StageScript(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.TaskOption": schema_pkg_apis_tf_v1alpha2_TaskOption(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Terraform": schema_pkg_apis_tf_v1alpha2_Terraform(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.TerraformSpec": schema_pkg_apis_tf_v1alpha2_TerraformSpec(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.TerraformStatus": schema_pkg_apis_tf_v1alpha2_TerraformStatus(ref),
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.TokenSecretRef": schema_pkg_apis_tf_v1alpha2_TokenSecretRef(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.AWSCredentials": schema_pkg_apis_tf_v1beta1_AWSCredentials(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ConfigMapSelector": schema_pkg_apis_tf_v1beta1_ConfigMapSelector(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Credentials": schema_pkg_apis_tf_v1beta1_Credentials(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.GitHTTPS": schema_pkg_apis_tf_v1beta1_GitHTTPS(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.GitSCM": schema_pkg_apis_tf_v1beta1_GitSCM(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.GitSSH": schema_pkg_apis_tf_v1beta1_GitSSH(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ImageConfig": schema_pkg_apis_tf_v1beta1_ImageConfig(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Images": schema_pkg_apis_tf_v1beta1_Images(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Module": schema_pkg_apis_tf_v1beta1_Module(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Plugin": schema_pkg_apis_tf_v1beta1_Plugin(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ProxyOpts": schema_pkg_apis_tf_v1beta1_ProxyOpts(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ResourceDownload": schema_pkg_apis_tf_v1beta1_ResourceDownload(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.SCMAuthMethod": schema_pkg_apis_tf_v1beta1_SCMAuthMethod(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.SSHKeySecretRef": schema_pkg_apis_tf_v1beta1_SSHKeySecretRef(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.SecretNameRef": schema_pkg_apis_tf_v1beta1_SecretNameRef(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Setup": schema_pkg_apis_tf_v1beta1_Setup(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Stage": schema_pkg_apis_tf_v1beta1_Stage(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.StageScript": schema_pkg_apis_tf_v1beta1_StageScript(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.TaskOption": schema_pkg_apis_tf_v1beta1_TaskOption(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Terraform": schema_pkg_apis_tf_v1beta1_Terraform(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.TerraformSpec": schema_pkg_apis_tf_v1beta1_TerraformSpec(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.TerraformStatus": schema_pkg_apis_tf_v1beta1_TerraformStatus(ref),
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.TokenSecretRef": schema_pkg_apis_tf_v1beta1_TokenSecretRef(ref),
}
}
-func schema_pkg_apis_tf_v1alpha2_AWSCredentials(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_AWSCredentials(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -83,7 +83,7 @@ func schema_pkg_apis_tf_v1alpha2_AWSCredentials(ref common.ReferenceCallback) co
}
}
-func schema_pkg_apis_tf_v1alpha2_ConfigMapSelector(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_ConfigMapSelector(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -110,7 +110,7 @@ func schema_pkg_apis_tf_v1alpha2_ConfigMapSelector(ref common.ReferenceCallback)
}
}
-func schema_pkg_apis_tf_v1alpha2_Credentials(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_Credentials(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -121,14 +121,14 @@ func schema_pkg_apis_tf_v1alpha2_Credentials(ref common.ReferenceCallback) commo
SchemaProps: spec.SchemaProps{
Description: "SecretNameRef will load environment variables into the terraform runner from a kubernetes secret",
Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.SecretNameRef"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.SecretNameRef"),
},
},
"aws": {
SchemaProps: spec.SchemaProps{
Description: "AWSCredentials contains the different methods to load AWS credentials for the Terraform AWS Provider. If using AWS_ACCESS_KEY_ID and/or environment variables for credentials, use fromEnvs.",
Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.AWSCredentials"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.AWSCredentials"),
},
},
"serviceAccountAnnotations": {
@@ -151,11 +151,11 @@ func schema_pkg_apis_tf_v1alpha2_Credentials(ref common.ReferenceCallback) commo
},
},
Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.AWSCredentials", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.SecretNameRef"},
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.AWSCredentials", "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.SecretNameRef"},
}
}
-func schema_pkg_apis_tf_v1alpha2_GitHTTPS(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_GitHTTPS(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -170,7 +170,7 @@ func schema_pkg_apis_tf_v1alpha2_GitHTTPS(ref common.ReferenceCallback) common.O
},
"tokenSecretRef": {
SchemaProps: spec.SchemaProps{
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.TokenSecretRef"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.TokenSecretRef"),
},
},
},
@@ -178,11 +178,11 @@ func schema_pkg_apis_tf_v1alpha2_GitHTTPS(ref common.ReferenceCallback) common.O
},
},
Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.TokenSecretRef"},
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.TokenSecretRef"},
}
}
-func schema_pkg_apis_tf_v1alpha2_GitSCM(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_GitSCM(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -191,23 +191,23 @@ func schema_pkg_apis_tf_v1alpha2_GitSCM(ref common.ReferenceCallback) common.Ope
Properties: map[string]spec.Schema{
"ssh": {
SchemaProps: spec.SchemaProps{
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.GitSSH"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.GitSSH"),
},
},
"https": {
SchemaProps: spec.SchemaProps{
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.GitHTTPS"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.GitHTTPS"),
},
},
},
},
},
Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.GitHTTPS", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.GitSSH"},
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.GitHTTPS", "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.GitSSH"},
}
}
-func schema_pkg_apis_tf_v1alpha2_GitSSH(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_GitSSH(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -222,7 +222,7 @@ func schema_pkg_apis_tf_v1alpha2_GitSSH(ref common.ReferenceCallback) common.Ope
},
"sshKeySecretRef": {
SchemaProps: spec.SchemaProps{
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.SSHKeySecretRef"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.SSHKeySecretRef"),
},
},
},
@@ -230,11 +230,11 @@ func schema_pkg_apis_tf_v1alpha2_GitSSH(ref common.ReferenceCallback) common.Ope
},
},
Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.SSHKeySecretRef"},
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.SSHKeySecretRef"},
}
}
-func schema_pkg_apis_tf_v1alpha2_ImageConfig(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_ImageConfig(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -263,7 +263,7 @@ func schema_pkg_apis_tf_v1alpha2_ImageConfig(ref common.ReferenceCallback) commo
}
}
-func schema_pkg_apis_tf_v1alpha2_Images(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_Images(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -273,30 +273,30 @@ func schema_pkg_apis_tf_v1alpha2_Images(ref common.ReferenceCallback) common.Ope
"terraform": {
SchemaProps: spec.SchemaProps{
Description: "Terraform task type container image definition",
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ImageConfig"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ImageConfig"),
},
},
"script": {
SchemaProps: spec.SchemaProps{
Description: "Script task type container image definition",
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ImageConfig"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ImageConfig"),
},
},
"setup": {
SchemaProps: spec.SchemaProps{
Description: "Setup task type container image definition",
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ImageConfig"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ImageConfig"),
},
},
},
},
},
Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ImageConfig"},
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ImageConfig"},
}
}
-func schema_pkg_apis_tf_v1alpha2_Module(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_Module(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -320,7 +320,7 @@ func schema_pkg_apis_tf_v1alpha2_Module(ref common.ReferenceCallback) common.Ope
"configMapSeclector": {
SchemaProps: spec.SchemaProps{
Description: "ConfigMapSelector is an option that points to an existing configmap on the executing cluster. The configmap is expected to contains has the terraform module (ie keys ending with .tf). The configmap would need to live in the same namespace as the tfo resource.\n\nThe configmap is mounted as a volume and put into the TFO_MAIN_MODULE path by the setup task.\n\nIf a key is defined, the value is used as the module else the entirety of the data objects will be loaded as files.",
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ConfigMapSelector"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ConfigMapSelector"),
},
},
"inline": {
@@ -334,11 +334,11 @@ func schema_pkg_apis_tf_v1alpha2_Module(ref common.ReferenceCallback) common.Ope
},
},
Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ConfigMapSelector"},
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ConfigMapSelector"},
}
}
-func schema_pkg_apis_tf_v1alpha2_Plugin(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_Plugin(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -383,7 +383,7 @@ func schema_pkg_apis_tf_v1alpha2_Plugin(ref common.ReferenceCallback) common.Ope
}
}
-func schema_pkg_apis_tf_v1alpha2_ProxyOpts(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_ProxyOpts(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -405,7 +405,7 @@ func schema_pkg_apis_tf_v1alpha2_ProxyOpts(ref common.ReferenceCallback) common.
"sshKeySecretRef": {
SchemaProps: spec.SchemaProps{
Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.SSHKeySecretRef"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.SSHKeySecretRef"),
},
},
},
@@ -413,11 +413,11 @@ func schema_pkg_apis_tf_v1alpha2_ProxyOpts(ref common.ReferenceCallback) common.
},
},
Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.SSHKeySecretRef"},
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.SSHKeySecretRef"},
}
}
-func schema_pkg_apis_tf_v1alpha2_ResourceDownload(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_ResourceDownload(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -453,7 +453,7 @@ func schema_pkg_apis_tf_v1alpha2_ResourceDownload(ref common.ReferenceCallback)
}
}
-func schema_pkg_apis_tf_v1alpha2_SCMAuthMethod(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_SCMAuthMethod(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -470,7 +470,7 @@ func schema_pkg_apis_tf_v1alpha2_SCMAuthMethod(ref common.ReferenceCallback) com
"git": {
SchemaProps: spec.SchemaProps{
Description: "Git configuration options for auth methods of git",
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.GitSCM"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.GitSCM"),
},
},
},
@@ -478,11 +478,11 @@ func schema_pkg_apis_tf_v1alpha2_SCMAuthMethod(ref common.ReferenceCallback) com
},
},
Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.GitSCM"},
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.GitSCM"},
}
}
-func schema_pkg_apis_tf_v1alpha2_SSHKeySecretRef(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_SSHKeySecretRef(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -518,7 +518,7 @@ func schema_pkg_apis_tf_v1alpha2_SSHKeySecretRef(ref common.ReferenceCallback) c
}
}
-func schema_pkg_apis_tf_v1alpha2_SecretNameRef(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_SecretNameRef(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -554,7 +554,7 @@ func schema_pkg_apis_tf_v1alpha2_SecretNameRef(ref common.ReferenceCallback) com
}
}
-func schema_pkg_apis_tf_v1alpha2_Setup(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_Setup(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -569,7 +569,7 @@ func schema_pkg_apis_tf_v1alpha2_Setup(ref common.ReferenceCallback) common.Open
Schema: &spec.Schema{
SchemaProps: spec.SchemaProps{
Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ResourceDownload"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ResourceDownload"),
},
},
},
@@ -586,11 +586,11 @@ func schema_pkg_apis_tf_v1alpha2_Setup(ref common.ReferenceCallback) common.Open
},
},
Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ResourceDownload"},
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ResourceDownload"},
}
}
-func schema_pkg_apis_tf_v1alpha2_Stage(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_Stage(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -681,7 +681,7 @@ func schema_pkg_apis_tf_v1alpha2_Stage(ref common.ReferenceCallback) common.Open
}
}
-func schema_pkg_apis_tf_v1alpha2_StageScript(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_StageScript(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -698,7 +698,7 @@ func schema_pkg_apis_tf_v1alpha2_StageScript(ref common.ReferenceCallback) commo
"configMapSelector": {
SchemaProps: spec.SchemaProps{
Description: "ConfigMapSelector reads a in a script from a configmap name+key",
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ConfigMapSelector"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ConfigMapSelector"),
},
},
"inline": {
@@ -712,11 +712,11 @@ func schema_pkg_apis_tf_v1alpha2_StageScript(ref common.ReferenceCallback) commo
},
},
Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ConfigMapSelector"},
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ConfigMapSelector"},
}
}
-func schema_pkg_apis_tf_v1alpha2_TaskOption(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_TaskOption(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -828,7 +828,7 @@ func schema_pkg_apis_tf_v1alpha2_TaskOption(ref common.ReferenceCallback) common
SchemaProps: spec.SchemaProps{
Description: "Script is used to configure the source of the task's executable script.",
Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.StageScript"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.StageScript"),
},
},
"restartPolicy": {
@@ -843,11 +843,11 @@ func schema_pkg_apis_tf_v1alpha2_TaskOption(ref common.ReferenceCallback) common
},
},
Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.StageScript", "k8s.io/api/core/v1.EnvFromSource", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/rbac/v1.PolicyRule"},
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.StageScript", "k8s.io/api/core/v1.EnvFromSource", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/rbac/v1.PolicyRule"},
}
}
-func schema_pkg_apis_tf_v1alpha2_Terraform(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_Terraform(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -877,24 +877,24 @@ func schema_pkg_apis_tf_v1alpha2_Terraform(ref common.ReferenceCallback) common.
"spec": {
SchemaProps: spec.SchemaProps{
Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.TerraformSpec"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.TerraformSpec"),
},
},
"status": {
SchemaProps: spec.SchemaProps{
Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.TerraformStatus"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.TerraformStatus"),
},
},
},
},
},
Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.TerraformSpec", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.TerraformStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.TerraformSpec", "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.TerraformStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"},
}
}
-func schema_pkg_apis_tf_v1alpha2_TerraformSpec(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_TerraformSpec(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -987,7 +987,7 @@ func schema_pkg_apis_tf_v1alpha2_TerraformSpec(ref common.ReferenceCallback) com
Schema: &spec.Schema{
SchemaProps: spec.SchemaProps{
Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Credentials"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Credentials"),
},
},
},
@@ -1003,7 +1003,7 @@ func schema_pkg_apis_tf_v1alpha2_TerraformSpec(ref common.ReferenceCallback) com
"sshTunnel": {
SchemaProps: spec.SchemaProps{
Description: "SSHTunnel can be defined for pulling from scm sources that cannot be accessed by the network the operator/runner runs in. An example is enterprise-Github servers running on a private network.",
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ProxyOpts"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ProxyOpts"),
},
},
"scmAuthMethods": {
@@ -1014,7 +1014,7 @@ func schema_pkg_apis_tf_v1alpha2_TerraformSpec(ref common.ReferenceCallback) com
Schema: &spec.Schema{
SchemaProps: spec.SchemaProps{
Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.SCMAuthMethod"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.SCMAuthMethod"),
},
},
},
@@ -1023,20 +1023,20 @@ func schema_pkg_apis_tf_v1alpha2_TerraformSpec(ref common.ReferenceCallback) com
"images": {
SchemaProps: spec.SchemaProps{
Description: "Images describes the container images used by task classes.",
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Images"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Images"),
},
},
"setup": {
SchemaProps: spec.SchemaProps{
Description: "Setup is configuration generally used once in the setup task",
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Setup"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Setup"),
},
},
"terraformModule": {
SchemaProps: spec.SchemaProps{
Description: "TerraformModule is used to configure the source of the terraform module.",
Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Module"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Module"),
},
},
"terraformVersion": {
@@ -1063,7 +1063,7 @@ func schema_pkg_apis_tf_v1alpha2_TerraformSpec(ref common.ReferenceCallback) com
Schema: &spec.Schema{
SchemaProps: spec.SchemaProps{
Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.TaskOption"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.TaskOption"),
},
},
},
@@ -1078,7 +1078,7 @@ func schema_pkg_apis_tf_v1alpha2_TerraformSpec(ref common.ReferenceCallback) com
Schema: &spec.Schema{
SchemaProps: spec.SchemaProps{
Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Plugin"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Plugin"),
},
},
},
@@ -1096,11 +1096,11 @@ func schema_pkg_apis_tf_v1alpha2_TerraformSpec(ref common.ReferenceCallback) com
},
},
Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Credentials", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Images", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Module", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Plugin", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.ProxyOpts", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.SCMAuthMethod", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Setup", "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.TaskOption", "k8s.io/apimachinery/pkg/api/resource.Quantity"},
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Credentials", "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Images", "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Module", "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Plugin", "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.ProxyOpts", "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.SCMAuthMethod", "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Setup", "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.TaskOption", "k8s.io/apimachinery/pkg/api/resource.Quantity"},
}
}
-func schema_pkg_apis_tf_v1alpha2_TerraformStatus(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_TerraformStatus(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
@@ -1151,7 +1151,7 @@ func schema_pkg_apis_tf_v1alpha2_TerraformStatus(ref common.ReferenceCallback) c
Schema: &spec.Schema{
SchemaProps: spec.SchemaProps{
Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Stage"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Stage"),
},
},
},
@@ -1160,7 +1160,7 @@ func schema_pkg_apis_tf_v1alpha2_TerraformStatus(ref common.ReferenceCallback) c
"stage": {
SchemaProps: spec.SchemaProps{
Default: map[string]interface{}{},
- Ref: ref("github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Stage"),
+ Ref: ref("github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Stage"),
},
},
"plugins": {
@@ -1183,11 +1183,11 @@ func schema_pkg_apis_tf_v1alpha2_TerraformStatus(ref common.ReferenceCallback) c
},
},
Dependencies: []string{
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2.Stage"},
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1.Stage"},
}
}
-func schema_pkg_apis_tf_v1alpha2_TokenSecretRef(ref common.ReferenceCallback) common.OpenAPIDefinition {
+func schema_pkg_apis_tf_v1beta1_TokenSecretRef(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
diff --git a/pkg/client/clientset/versioned/clientset.go b/pkg/client/clientset/versioned/clientset.go
index 81e46190415a9b731e3a8c7bd6c4518eb90484de..8ccc11c583854a7f6a344a3b673239cc2ab8ebc7 100644
--- a/pkg/client/clientset/versioned/clientset.go
+++ b/pkg/client/clientset/versioned/clientset.go
@@ -20,8 +20,9 @@ package versioned
import (
"fmt"
+ "net/http"
- tfv1alpha2 "github.com/isaaguilar/terraform-operator/pkg/client/clientset/versioned/typed/tf/v1alpha2"
+ tfv1beta1 "github.com/galleybytes/terraform-operator/pkg/client/clientset/versioned/typed/tf/v1beta1"
discovery "k8s.io/client-go/discovery"
rest "k8s.io/client-go/rest"
flowcontrol "k8s.io/client-go/util/flowcontrol"
@@ -29,19 +30,18 @@ import (
type Interface interface {
Discovery() discovery.DiscoveryInterface
- TfV1alpha2() tfv1alpha2.TfV1alpha2Interface
+ TfV1beta1() tfv1beta1.TfV1beta1Interface
}
-// Clientset contains the clients for groups. Each group has exactly one
-// version included in a Clientset.
+// Clientset contains the clients for groups.
type Clientset struct {
*discovery.DiscoveryClient
- tfV1alpha2 *tfv1alpha2.TfV1alpha2Client
+ tfV1beta1 *tfv1beta1.TfV1beta1Client
}
-// TfV1alpha2 retrieves the TfV1alpha2Client
-func (c *Clientset) TfV1alpha2() tfv1alpha2.TfV1alpha2Interface {
- return c.tfV1alpha2
+// TfV1beta1 retrieves the TfV1beta1Client
+func (c *Clientset) TfV1beta1() tfv1beta1.TfV1beta1Interface {
+ return c.tfV1beta1
}
// Discovery retrieves the DiscoveryClient
@@ -55,22 +55,45 @@ func (c *Clientset) Discovery() discovery.DiscoveryInterface {
// NewForConfig creates a new Clientset for the given config.
// If config's RateLimiter is not set and QPS and Burst are acceptable,
// NewForConfig will generate a rate-limiter in configShallowCopy.
+// NewForConfig is equivalent to NewForConfigAndClient(c, httpClient),
+// where httpClient was generated with rest.HTTPClientFor(c).
func NewForConfig(c *rest.Config) (*Clientset, error) {
configShallowCopy := *c
+
+ if configShallowCopy.UserAgent == "" {
+ configShallowCopy.UserAgent = rest.DefaultKubernetesUserAgent()
+ }
+
+ // share the transport between all clients
+ httpClient, err := rest.HTTPClientFor(&configShallowCopy)
+ if err != nil {
+ return nil, err
+ }
+
+ return NewForConfigAndClient(&configShallowCopy, httpClient)
+}
+
+// NewForConfigAndClient creates a new Clientset for the given config and http client.
+// Note the http client provided takes precedence over the configured transport values.
+// If config's RateLimiter is not set and QPS and Burst are acceptable,
+// NewForConfigAndClient will generate a rate-limiter in configShallowCopy.
+func NewForConfigAndClient(c *rest.Config, httpClient *http.Client) (*Clientset, error) {
+ configShallowCopy := *c
if configShallowCopy.RateLimiter == nil && configShallowCopy.QPS > 0 {
if configShallowCopy.Burst <= 0 {
return nil, fmt.Errorf("burst is required to be greater than 0 when RateLimiter is not set and QPS is set to greater than 0")
}
configShallowCopy.RateLimiter = flowcontrol.NewTokenBucketRateLimiter(configShallowCopy.QPS, configShallowCopy.Burst)
}
+
var cs Clientset
var err error
- cs.tfV1alpha2, err = tfv1alpha2.NewForConfig(&configShallowCopy)
+ cs.tfV1beta1, err = tfv1beta1.NewForConfigAndClient(&configShallowCopy, httpClient)
if err != nil {
return nil, err
}
- cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy)
+ cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfigAndClient(&configShallowCopy, httpClient)
if err != nil {
return nil, err
}
@@ -80,17 +103,17 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
// NewForConfigOrDie creates a new Clientset for the given config and
// panics if there is an error in the config.
func NewForConfigOrDie(c *rest.Config) *Clientset {
- var cs Clientset
- cs.tfV1alpha2 = tfv1alpha2.NewForConfigOrDie(c)
-
- cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c)
- return &cs
+ cs, err := NewForConfig(c)
+ if err != nil {
+ panic(err)
+ }
+ return cs
}
// New creates a new Clientset for the given RESTClient.
func New(c rest.Interface) *Clientset {
var cs Clientset
- cs.tfV1alpha2 = tfv1alpha2.New(c)
+ cs.tfV1beta1 = tfv1beta1.New(c)
cs.DiscoveryClient = discovery.NewDiscoveryClient(c)
return &cs
diff --git a/pkg/client/clientset/versioned/doc.go b/pkg/client/clientset/versioned/doc.go
deleted file mode 100644
index c7805c6d96153bac6c0ce22b1c33dfdc1b301f33..0000000000000000000000000000000000000000
--- a/pkg/client/clientset/versioned/doc.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright isaaguilar.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-// This package has the automatically generated clientset.
-package versioned
diff --git a/pkg/client/clientset/versioned/fake/clientset_generated.go b/pkg/client/clientset/versioned/fake/clientset_generated.go
index 47d918d4a067e7039c51ec96022805b93fa84d19..e8cc99d58c64b1499b83709a88533e4e79135291 100644
--- a/pkg/client/clientset/versioned/fake/clientset_generated.go
+++ b/pkg/client/clientset/versioned/fake/clientset_generated.go
@@ -19,9 +19,9 @@ limitations under the License.
package fake
import (
- clientset "github.com/isaaguilar/terraform-operator/pkg/client/clientset/versioned"
- tfv1alpha2 "github.com/isaaguilar/terraform-operator/pkg/client/clientset/versioned/typed/tf/v1alpha2"
- faketfv1alpha2 "github.com/isaaguilar/terraform-operator/pkg/client/clientset/versioned/typed/tf/v1alpha2/fake"
+ clientset "github.com/galleybytes/terraform-operator/pkg/client/clientset/versioned"
+ tfv1beta1 "github.com/galleybytes/terraform-operator/pkg/client/clientset/versioned/typed/tf/v1beta1"
+ faketfv1beta1 "github.com/galleybytes/terraform-operator/pkg/client/clientset/versioned/typed/tf/v1beta1/fake"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/discovery"
@@ -74,9 +74,12 @@ func (c *Clientset) Tracker() testing.ObjectTracker {
return c.tracker
}
-var _ clientset.Interface = &Clientset{}
+var (
+ _ clientset.Interface = &Clientset{}
+ _ testing.FakeClient = &Clientset{}
+)
-// TfV1alpha2 retrieves the TfV1alpha2Client
-func (c *Clientset) TfV1alpha2() tfv1alpha2.TfV1alpha2Interface {
- return &faketfv1alpha2.FakeTfV1alpha2{Fake: &c.Fake}
+// TfV1beta1 retrieves the TfV1beta1Client
+func (c *Clientset) TfV1beta1() tfv1beta1.TfV1beta1Interface {
+ return &faketfv1beta1.FakeTfV1beta1{Fake: &c.Fake}
}
diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go
index a2d3b437275107b4f30fa69495d6f888db97a82b..0d64430fa2b2db413a6b32ab27d6af2ebf1aa11b 100644
--- a/pkg/client/clientset/versioned/fake/register.go
+++ b/pkg/client/clientset/versioned/fake/register.go
@@ -19,7 +19,7 @@ limitations under the License.
package fake
import (
- tfv1alpha2 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2"
+ tfv1beta1 "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -31,7 +31,7 @@ var scheme = runtime.NewScheme()
var codecs = serializer.NewCodecFactory(scheme)
var localSchemeBuilder = runtime.SchemeBuilder{
- tfv1alpha2.AddToScheme,
+ tfv1beta1.AddToScheme,
}
// AddToScheme adds all types of this clientset into the given scheme. This allows composition
diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go
index 5ebf624d6ec969fc97f18686af659fb2f48b5fab..86c4f6480ec4a6d257da86f2d2c4bbfae8750747 100644
--- a/pkg/client/clientset/versioned/scheme/register.go
+++ b/pkg/client/clientset/versioned/scheme/register.go
@@ -19,7 +19,7 @@ limitations under the License.
package scheme
import (
- tfv1alpha2 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2"
+ tfv1beta1 "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -31,7 +31,7 @@ var Scheme = runtime.NewScheme()
var Codecs = serializer.NewCodecFactory(Scheme)
var ParameterCodec = runtime.NewParameterCodec(Scheme)
var localSchemeBuilder = runtime.SchemeBuilder{
- tfv1alpha2.AddToScheme,
+ tfv1beta1.AddToScheme,
}
// AddToScheme adds all types of this clientset into the given scheme. This allows composition
diff --git a/pkg/client/clientset/versioned/typed/tf/v1alpha1/terraform.go b/pkg/client/clientset/versioned/typed/tf/v1alpha1/terraform.go
deleted file mode 100644
index bfa1eaef0b20f4d2a1de9882a381f14aef328013..0000000000000000000000000000000000000000
--- a/pkg/client/clientset/versioned/typed/tf/v1alpha1/terraform.go
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
-Copyright isaaguilar.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package v1alpha1
-
-import (
- "context"
- "time"
-
- v1alpha1 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1"
- scheme "github.com/isaaguilar/terraform-operator/pkg/client/clientset/versioned/scheme"
- v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- types "k8s.io/apimachinery/pkg/types"
- watch "k8s.io/apimachinery/pkg/watch"
- rest "k8s.io/client-go/rest"
-)
-
-// TerraformsGetter has a method to return a TerraformInterface.
-// A group's client should implement this interface.
-type TerraformsGetter interface {
- Terraforms(namespace string) TerraformInterface
-}
-
-// TerraformInterface has methods to work with Terraform resources.
-type TerraformInterface interface {
- Create(ctx context.Context, terraform *v1alpha1.Terraform, opts v1.CreateOptions) (*v1alpha1.Terraform, error)
- Update(ctx context.Context, terraform *v1alpha1.Terraform, opts v1.UpdateOptions) (*v1alpha1.Terraform, error)
- UpdateStatus(ctx context.Context, terraform *v1alpha1.Terraform, opts v1.UpdateOptions) (*v1alpha1.Terraform, error)
- Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
- DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
- Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha1.Terraform, error)
- List(ctx context.Context, opts v1.ListOptions) (*v1alpha1.TerraformList, error)
- Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
- Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Terraform, err error)
- TerraformExpansion
-}
-
-// terraforms implements TerraformInterface
-type terraforms struct {
- client rest.Interface
- ns string
-}
-
-// newTerraforms returns a Terraforms
-func newTerraforms(c *TfV1alpha1Client, namespace string) *terraforms {
- return &terraforms{
- client: c.RESTClient(),
- ns: namespace,
- }
-}
-
-// Get takes name of the terraform, and returns the corresponding terraform object, and an error if there is any.
-func (c *terraforms) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Terraform, err error) {
- result = &v1alpha1.Terraform{}
- err = c.client.Get().
- Namespace(c.ns).
- Resource("terraforms").
- Name(name).
- VersionedParams(&options, scheme.ParameterCodec).
- Do(ctx).
- Into(result)
- return
-}
-
-// List takes label and field selectors, and returns the list of Terraforms that match those selectors.
-func (c *terraforms) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.TerraformList, err error) {
- var timeout time.Duration
- if opts.TimeoutSeconds != nil {
- timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
- }
- result = &v1alpha1.TerraformList{}
- err = c.client.Get().
- Namespace(c.ns).
- Resource("terraforms").
- VersionedParams(&opts, scheme.ParameterCodec).
- Timeout(timeout).
- Do(ctx).
- Into(result)
- return
-}
-
-// Watch returns a watch.Interface that watches the requested terraforms.
-func (c *terraforms) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
- var timeout time.Duration
- if opts.TimeoutSeconds != nil {
- timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
- }
- opts.Watch = true
- return c.client.Get().
- Namespace(c.ns).
- Resource("terraforms").
- VersionedParams(&opts, scheme.ParameterCodec).
- Timeout(timeout).
- Watch(ctx)
-}
-
-// Create takes the representation of a terraform and creates it. Returns the server's representation of the terraform, and an error, if there is any.
-func (c *terraforms) Create(ctx context.Context, terraform *v1alpha1.Terraform, opts v1.CreateOptions) (result *v1alpha1.Terraform, err error) {
- result = &v1alpha1.Terraform{}
- err = c.client.Post().
- Namespace(c.ns).
- Resource("terraforms").
- VersionedParams(&opts, scheme.ParameterCodec).
- Body(terraform).
- Do(ctx).
- Into(result)
- return
-}
-
-// Update takes the representation of a terraform and updates it. Returns the server's representation of the terraform, and an error, if there is any.
-func (c *terraforms) Update(ctx context.Context, terraform *v1alpha1.Terraform, opts v1.UpdateOptions) (result *v1alpha1.Terraform, err error) {
- result = &v1alpha1.Terraform{}
- err = c.client.Put().
- Namespace(c.ns).
- Resource("terraforms").
- Name(terraform.Name).
- VersionedParams(&opts, scheme.ParameterCodec).
- Body(terraform).
- Do(ctx).
- Into(result)
- return
-}
-
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *terraforms) UpdateStatus(ctx context.Context, terraform *v1alpha1.Terraform, opts v1.UpdateOptions) (result *v1alpha1.Terraform, err error) {
- result = &v1alpha1.Terraform{}
- err = c.client.Put().
- Namespace(c.ns).
- Resource("terraforms").
- Name(terraform.Name).
- SubResource("status").
- VersionedParams(&opts, scheme.ParameterCodec).
- Body(terraform).
- Do(ctx).
- Into(result)
- return
-}
-
-// Delete takes name of the terraform and deletes it. Returns an error if one occurs.
-func (c *terraforms) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
- return c.client.Delete().
- Namespace(c.ns).
- Resource("terraforms").
- Name(name).
- Body(&opts).
- Do(ctx).
- Error()
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *terraforms) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
- var timeout time.Duration
- if listOpts.TimeoutSeconds != nil {
- timeout = time.Duration(*listOpts.TimeoutSeconds) * time.Second
- }
- return c.client.Delete().
- Namespace(c.ns).
- Resource("terraforms").
- VersionedParams(&listOpts, scheme.ParameterCodec).
- Timeout(timeout).
- Body(&opts).
- Do(ctx).
- Error()
-}
-
-// Patch applies the patch and returns the patched terraform.
-func (c *terraforms) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Terraform, err error) {
- result = &v1alpha1.Terraform{}
- err = c.client.Patch(pt).
- Namespace(c.ns).
- Resource("terraforms").
- Name(name).
- SubResource(subresources...).
- VersionedParams(&opts, scheme.ParameterCodec).
- Body(data).
- Do(ctx).
- Into(result)
- return
-}
diff --git a/pkg/client/clientset/versioned/typed/tf/v1alpha1/tf_client.go b/pkg/client/clientset/versioned/typed/tf/v1alpha1/tf_client.go
deleted file mode 100644
index c06155e580a2ca8d6f285981f77f0505a332fabe..0000000000000000000000000000000000000000
--- a/pkg/client/clientset/versioned/typed/tf/v1alpha1/tf_client.go
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-Copyright isaaguilar.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package v1alpha1
-
-import (
- v1alpha1 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1"
- "github.com/isaaguilar/terraform-operator/pkg/client/clientset/versioned/scheme"
- rest "k8s.io/client-go/rest"
-)
-
-type TfV1alpha1Interface interface {
- RESTClient() rest.Interface
- TerraformsGetter
-}
-
-// TfV1alpha1Client is used to interact with features provided by the tf.isaaguilar.com group.
-type TfV1alpha1Client struct {
- restClient rest.Interface
-}
-
-func (c *TfV1alpha1Client) Terraforms(namespace string) TerraformInterface {
- return newTerraforms(c, namespace)
-}
-
-// NewForConfig creates a new TfV1alpha1Client for the given config.
-func NewForConfig(c *rest.Config) (*TfV1alpha1Client, error) {
- config := *c
- if err := setConfigDefaults(&config); err != nil {
- return nil, err
- }
- client, err := rest.RESTClientFor(&config)
- if err != nil {
- return nil, err
- }
- return &TfV1alpha1Client{client}, nil
-}
-
-// NewForConfigOrDie creates a new TfV1alpha1Client for the given config and
-// panics if there is an error in the config.
-func NewForConfigOrDie(c *rest.Config) *TfV1alpha1Client {
- client, err := NewForConfig(c)
- if err != nil {
- panic(err)
- }
- return client
-}
-
-// New creates a new TfV1alpha1Client for the given RESTClient.
-func New(c rest.Interface) *TfV1alpha1Client {
- return &TfV1alpha1Client{c}
-}
-
-func setConfigDefaults(config *rest.Config) error {
- gv := v1alpha1.SchemeGroupVersion
- config.GroupVersion = &gv
- config.APIPath = "/apis"
- config.NegotiatedSerializer = scheme.Codecs.WithoutConversion()
-
- if config.UserAgent == "" {
- config.UserAgent = rest.DefaultKubernetesUserAgent()
- }
-
- return nil
-}
-
-// RESTClient returns a RESTClient that is used to communicate
-// with API server by this client implementation.
-func (c *TfV1alpha1Client) RESTClient() rest.Interface {
- if c == nil {
- return nil
- }
- return c.restClient
-}
diff --git a/pkg/client/clientset/versioned/typed/tf/v1alpha2/doc.go b/pkg/client/clientset/versioned/typed/tf/v1alpha2/doc.go
deleted file mode 100644
index 6a0af6ce17ccf7a01f274ed6c6b88e053d252000..0000000000000000000000000000000000000000
--- a/pkg/client/clientset/versioned/typed/tf/v1alpha2/doc.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright isaaguilar.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-// This package has the automatically generated typed clients.
-package v1alpha2
diff --git a/pkg/client/clientset/versioned/typed/tf/v1alpha2/fake/doc.go b/pkg/client/clientset/versioned/typed/tf/v1alpha2/fake/doc.go
deleted file mode 100644
index 5cf2d7bfd282cc47716d76e56b95d2ff7e895ccd..0000000000000000000000000000000000000000
--- a/pkg/client/clientset/versioned/typed/tf/v1alpha2/fake/doc.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright isaaguilar.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-// Package fake has the automatically generated clients.
-package fake
diff --git a/pkg/client/clientset/versioned/typed/tf/v1alpha2/fake/fake_terraform.go b/pkg/client/clientset/versioned/typed/tf/v1alpha2/fake/fake_terraform.go
deleted file mode 100644
index ff6b9a177c13167402be104cca7645ac0b37698f..0000000000000000000000000000000000000000
--- a/pkg/client/clientset/versioned/typed/tf/v1alpha2/fake/fake_terraform.go
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-Copyright isaaguilar.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package fake
-
-import (
- "context"
-
- v1alpha2 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2"
- v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- labels "k8s.io/apimachinery/pkg/labels"
- schema "k8s.io/apimachinery/pkg/runtime/schema"
- types "k8s.io/apimachinery/pkg/types"
- watch "k8s.io/apimachinery/pkg/watch"
- testing "k8s.io/client-go/testing"
-)
-
-// FakeTerraforms implements TerraformInterface
-type FakeTerraforms struct {
- Fake *FakeTfV1alpha2
- ns string
-}
-
-var terraformsResource = schema.GroupVersionResource{Group: "tf.isaaguilar.com", Version: "v1alpha2", Resource: "terraforms"}
-
-var terraformsKind = schema.GroupVersionKind{Group: "tf.isaaguilar.com", Version: "v1alpha2", Kind: "Terraform"}
-
-// Get takes name of the terraform, and returns the corresponding terraform object, and an error if there is any.
-func (c *FakeTerraforms) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha2.Terraform, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewGetAction(terraformsResource, c.ns, name), &v1alpha2.Terraform{})
-
- if obj == nil {
- return nil, err
- }
- return obj.(*v1alpha2.Terraform), err
-}
-
-// List takes label and field selectors, and returns the list of Terraforms that match those selectors.
-func (c *FakeTerraforms) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha2.TerraformList, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewListAction(terraformsResource, terraformsKind, c.ns, opts), &v1alpha2.TerraformList{})
-
- if obj == nil {
- return nil, err
- }
-
- label, _, _ := testing.ExtractFromListOptions(opts)
- if label == nil {
- label = labels.Everything()
- }
- list := &v1alpha2.TerraformList{ListMeta: obj.(*v1alpha2.TerraformList).ListMeta}
- for _, item := range obj.(*v1alpha2.TerraformList).Items {
- if label.Matches(labels.Set(item.Labels)) {
- list.Items = append(list.Items, item)
- }
- }
- return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested terraforms.
-func (c *FakeTerraforms) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) {
- return c.Fake.
- InvokesWatch(testing.NewWatchAction(terraformsResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a terraform and creates it. Returns the server's representation of the terraform, and an error, if there is any.
-func (c *FakeTerraforms) Create(ctx context.Context, terraform *v1alpha2.Terraform, opts v1.CreateOptions) (result *v1alpha2.Terraform, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewCreateAction(terraformsResource, c.ns, terraform), &v1alpha2.Terraform{})
-
- if obj == nil {
- return nil, err
- }
- return obj.(*v1alpha2.Terraform), err
-}
-
-// Update takes the representation of a terraform and updates it. Returns the server's representation of the terraform, and an error, if there is any.
-func (c *FakeTerraforms) Update(ctx context.Context, terraform *v1alpha2.Terraform, opts v1.UpdateOptions) (result *v1alpha2.Terraform, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewUpdateAction(terraformsResource, c.ns, terraform), &v1alpha2.Terraform{})
-
- if obj == nil {
- return nil, err
- }
- return obj.(*v1alpha2.Terraform), err
-}
-
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeTerraforms) UpdateStatus(ctx context.Context, terraform *v1alpha2.Terraform, opts v1.UpdateOptions) (*v1alpha2.Terraform, error) {
- obj, err := c.Fake.
- Invokes(testing.NewUpdateSubresourceAction(terraformsResource, "status", c.ns, terraform), &v1alpha2.Terraform{})
-
- if obj == nil {
- return nil, err
- }
- return obj.(*v1alpha2.Terraform), err
-}
-
-// Delete takes name of the terraform and deletes it. Returns an error if one occurs.
-func (c *FakeTerraforms) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
- _, err := c.Fake.
- Invokes(testing.NewDeleteAction(terraformsResource, c.ns, name), &v1alpha2.Terraform{})
-
- return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeTerraforms) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
- action := testing.NewDeleteCollectionAction(terraformsResource, c.ns, listOpts)
-
- _, err := c.Fake.Invokes(action, &v1alpha2.TerraformList{})
- return err
-}
-
-// Patch applies the patch and returns the patched terraform.
-func (c *FakeTerraforms) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha2.Terraform, err error) {
- obj, err := c.Fake.
- Invokes(testing.NewPatchSubresourceAction(terraformsResource, c.ns, name, pt, data, subresources...), &v1alpha2.Terraform{})
-
- if obj == nil {
- return nil, err
- }
- return obj.(*v1alpha2.Terraform), err
-}
diff --git a/pkg/client/clientset/versioned/typed/tf/v1alpha2/fake/fake_tf_client.go b/pkg/client/clientset/versioned/typed/tf/v1alpha2/fake/fake_tf_client.go
deleted file mode 100644
index ffcbbff660146eb3cdd9dc441df0af0e7ec46540..0000000000000000000000000000000000000000
--- a/pkg/client/clientset/versioned/typed/tf/v1alpha2/fake/fake_tf_client.go
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright isaaguilar.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package fake
-
-import (
- v1alpha2 "github.com/isaaguilar/terraform-operator/pkg/client/clientset/versioned/typed/tf/v1alpha2"
- rest "k8s.io/client-go/rest"
- testing "k8s.io/client-go/testing"
-)
-
-type FakeTfV1alpha2 struct {
- *testing.Fake
-}
-
-func (c *FakeTfV1alpha2) Terraforms(namespace string) v1alpha2.TerraformInterface {
- return &FakeTerraforms{c, namespace}
-}
-
-// RESTClient returns a RESTClient that is used to communicate
-// with API server by this client implementation.
-func (c *FakeTfV1alpha2) RESTClient() rest.Interface {
- var ret *rest.RESTClient
- return ret
-}
diff --git a/pkg/client/clientset/versioned/typed/tf/v1alpha2/generated_expansion.go b/pkg/client/clientset/versioned/typed/tf/v1alpha2/generated_expansion.go
deleted file mode 100644
index 8d61cffc729168d2c01196133a0a71d00f65ad4d..0000000000000000000000000000000000000000
--- a/pkg/client/clientset/versioned/typed/tf/v1alpha2/generated_expansion.go
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-Copyright isaaguilar.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package v1alpha2
-
-type TerraformExpansion interface{}
diff --git a/pkg/client/clientset/versioned/typed/tf/v1alpha2/tf_client.go b/pkg/client/clientset/versioned/typed/tf/v1alpha2/tf_client.go
deleted file mode 100644
index 5f858de2e61d1fe9d20e3eb27601b74f4cece533..0000000000000000000000000000000000000000
--- a/pkg/client/clientset/versioned/typed/tf/v1alpha2/tf_client.go
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-Copyright isaaguilar.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package v1alpha2
-
-import (
- v1alpha2 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2"
- "github.com/isaaguilar/terraform-operator/pkg/client/clientset/versioned/scheme"
- rest "k8s.io/client-go/rest"
-)
-
-type TfV1alpha2Interface interface {
- RESTClient() rest.Interface
- TerraformsGetter
-}
-
-// TfV1alpha2Client is used to interact with features provided by the tf.isaaguilar.com group.
-type TfV1alpha2Client struct {
- restClient rest.Interface
-}
-
-func (c *TfV1alpha2Client) Terraforms(namespace string) TerraformInterface {
- return newTerraforms(c, namespace)
-}
-
-// NewForConfig creates a new TfV1alpha2Client for the given config.
-func NewForConfig(c *rest.Config) (*TfV1alpha2Client, error) {
- config := *c
- if err := setConfigDefaults(&config); err != nil {
- return nil, err
- }
- client, err := rest.RESTClientFor(&config)
- if err != nil {
- return nil, err
- }
- return &TfV1alpha2Client{client}, nil
-}
-
-// NewForConfigOrDie creates a new TfV1alpha2Client for the given config and
-// panics if there is an error in the config.
-func NewForConfigOrDie(c *rest.Config) *TfV1alpha2Client {
- client, err := NewForConfig(c)
- if err != nil {
- panic(err)
- }
- return client
-}
-
-// New creates a new TfV1alpha2Client for the given RESTClient.
-func New(c rest.Interface) *TfV1alpha2Client {
- return &TfV1alpha2Client{c}
-}
-
-func setConfigDefaults(config *rest.Config) error {
- gv := v1alpha2.SchemeGroupVersion
- config.GroupVersion = &gv
- config.APIPath = "/apis"
- config.NegotiatedSerializer = scheme.Codecs.WithoutConversion()
-
- if config.UserAgent == "" {
- config.UserAgent = rest.DefaultKubernetesUserAgent()
- }
-
- return nil
-}
-
-// RESTClient returns a RESTClient that is used to communicate
-// with API server by this client implementation.
-func (c *TfV1alpha2Client) RESTClient() rest.Interface {
- if c == nil {
- return nil
- }
- return c.restClient
-}
diff --git a/pkg/client/clientset/versioned/typed/tf/v1alpha1/doc.go b/pkg/client/clientset/versioned/typed/tf/v1beta1/doc.go
similarity index 97%
rename from pkg/client/clientset/versioned/typed/tf/v1alpha1/doc.go
rename to pkg/client/clientset/versioned/typed/tf/v1beta1/doc.go
index 592df69edef89c801297f68c746fcdc032b2cf3f..f10550415a185864f9105157188c7f2855ad41b2 100644
--- a/pkg/client/clientset/versioned/typed/tf/v1alpha1/doc.go
+++ b/pkg/client/clientset/versioned/typed/tf/v1beta1/doc.go
@@ -17,4 +17,4 @@ limitations under the License.
// Code generated by client-gen. DO NOT EDIT.
// This package has the automatically generated typed clients.
-package v1alpha1
+package v1beta1
diff --git a/pkg/client/clientset/versioned/typed/tf/v1alpha1/fake/doc.go b/pkg/client/clientset/versioned/typed/tf/v1beta1/fake/doc.go
similarity index 100%
rename from pkg/client/clientset/versioned/typed/tf/v1alpha1/fake/doc.go
rename to pkg/client/clientset/versioned/typed/tf/v1beta1/fake/doc.go
diff --git a/pkg/client/clientset/versioned/typed/tf/v1alpha1/fake/fake_terraform.go b/pkg/client/clientset/versioned/typed/tf/v1beta1/fake/fake_terraform.go
similarity index 71%
rename from pkg/client/clientset/versioned/typed/tf/v1alpha1/fake/fake_terraform.go
rename to pkg/client/clientset/versioned/typed/tf/v1beta1/fake/fake_terraform.go
index a5c77c809748e349336cbfcf47db9ed30703e35d..30df7fb82396e45504ab6e3bc50cedcbe7e84b4f 100644
--- a/pkg/client/clientset/versioned/typed/tf/v1alpha1/fake/fake_terraform.go
+++ b/pkg/client/clientset/versioned/typed/tf/v1beta1/fake/fake_terraform.go
@@ -21,10 +21,9 @@ package fake
import (
"context"
- v1alpha1 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1"
+ v1beta1 "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
- schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
testing "k8s.io/client-go/testing"
@@ -32,29 +31,29 @@ import (
// FakeTerraforms implements TerraformInterface
type FakeTerraforms struct {
- Fake *FakeTfV1alpha1
+ Fake *FakeTfV1beta1
ns string
}
-var terraformsResource = schema.GroupVersionResource{Group: "tf.isaaguilar.com", Version: "v1alpha1", Resource: "terraforms"}
+var terraformsResource = v1beta1.SchemeGroupVersion.WithResource("terraforms")
-var terraformsKind = schema.GroupVersionKind{Group: "tf.isaaguilar.com", Version: "v1alpha1", Kind: "Terraform"}
+var terraformsKind = v1beta1.SchemeGroupVersion.WithKind("Terraform")
// Get takes name of the terraform, and returns the corresponding terraform object, and an error if there is any.
-func (c *FakeTerraforms) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Terraform, err error) {
+func (c *FakeTerraforms) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.Terraform, err error) {
obj, err := c.Fake.
- Invokes(testing.NewGetAction(terraformsResource, c.ns, name), &v1alpha1.Terraform{})
+ Invokes(testing.NewGetAction(terraformsResource, c.ns, name), &v1beta1.Terraform{})
if obj == nil {
return nil, err
}
- return obj.(*v1alpha1.Terraform), err
+ return obj.(*v1beta1.Terraform), err
}
// List takes label and field selectors, and returns the list of Terraforms that match those selectors.
-func (c *FakeTerraforms) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha1.TerraformList, err error) {
+func (c *FakeTerraforms) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.TerraformList, err error) {
obj, err := c.Fake.
- Invokes(testing.NewListAction(terraformsResource, terraformsKind, c.ns, opts), &v1alpha1.TerraformList{})
+ Invokes(testing.NewListAction(terraformsResource, terraformsKind, c.ns, opts), &v1beta1.TerraformList{})
if obj == nil {
return nil, err
@@ -64,8 +63,8 @@ func (c *FakeTerraforms) List(ctx context.Context, opts v1.ListOptions) (result
if label == nil {
label = labels.Everything()
}
- list := &v1alpha1.TerraformList{ListMeta: obj.(*v1alpha1.TerraformList).ListMeta}
- for _, item := range obj.(*v1alpha1.TerraformList).Items {
+ list := &v1beta1.TerraformList{ListMeta: obj.(*v1beta1.TerraformList).ListMeta}
+ for _, item := range obj.(*v1beta1.TerraformList).Items {
if label.Matches(labels.Set(item.Labels)) {
list.Items = append(list.Items, item)
}
@@ -81,43 +80,43 @@ func (c *FakeTerraforms) Watch(ctx context.Context, opts v1.ListOptions) (watch.
}
// Create takes the representation of a terraform and creates it. Returns the server's representation of the terraform, and an error, if there is any.
-func (c *FakeTerraforms) Create(ctx context.Context, terraform *v1alpha1.Terraform, opts v1.CreateOptions) (result *v1alpha1.Terraform, err error) {
+func (c *FakeTerraforms) Create(ctx context.Context, terraform *v1beta1.Terraform, opts v1.CreateOptions) (result *v1beta1.Terraform, err error) {
obj, err := c.Fake.
- Invokes(testing.NewCreateAction(terraformsResource, c.ns, terraform), &v1alpha1.Terraform{})
+ Invokes(testing.NewCreateAction(terraformsResource, c.ns, terraform), &v1beta1.Terraform{})
if obj == nil {
return nil, err
}
- return obj.(*v1alpha1.Terraform), err
+ return obj.(*v1beta1.Terraform), err
}
// Update takes the representation of a terraform and updates it. Returns the server's representation of the terraform, and an error, if there is any.
-func (c *FakeTerraforms) Update(ctx context.Context, terraform *v1alpha1.Terraform, opts v1.UpdateOptions) (result *v1alpha1.Terraform, err error) {
+func (c *FakeTerraforms) Update(ctx context.Context, terraform *v1beta1.Terraform, opts v1.UpdateOptions) (result *v1beta1.Terraform, err error) {
obj, err := c.Fake.
- Invokes(testing.NewUpdateAction(terraformsResource, c.ns, terraform), &v1alpha1.Terraform{})
+ Invokes(testing.NewUpdateAction(terraformsResource, c.ns, terraform), &v1beta1.Terraform{})
if obj == nil {
return nil, err
}
- return obj.(*v1alpha1.Terraform), err
+ return obj.(*v1beta1.Terraform), err
}
// UpdateStatus was generated because the type contains a Status member.
// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeTerraforms) UpdateStatus(ctx context.Context, terraform *v1alpha1.Terraform, opts v1.UpdateOptions) (*v1alpha1.Terraform, error) {
+func (c *FakeTerraforms) UpdateStatus(ctx context.Context, terraform *v1beta1.Terraform, opts v1.UpdateOptions) (*v1beta1.Terraform, error) {
obj, err := c.Fake.
- Invokes(testing.NewUpdateSubresourceAction(terraformsResource, "status", c.ns, terraform), &v1alpha1.Terraform{})
+ Invokes(testing.NewUpdateSubresourceAction(terraformsResource, "status", c.ns, terraform), &v1beta1.Terraform{})
if obj == nil {
return nil, err
}
- return obj.(*v1alpha1.Terraform), err
+ return obj.(*v1beta1.Terraform), err
}
// Delete takes name of the terraform and deletes it. Returns an error if one occurs.
func (c *FakeTerraforms) Delete(ctx context.Context, name string, opts v1.DeleteOptions) error {
_, err := c.Fake.
- Invokes(testing.NewDeleteAction(terraformsResource, c.ns, name), &v1alpha1.Terraform{})
+ Invokes(testing.NewDeleteActionWithOptions(terraformsResource, c.ns, name, opts), &v1beta1.Terraform{})
return err
}
@@ -126,17 +125,17 @@ func (c *FakeTerraforms) Delete(ctx context.Context, name string, opts v1.Delete
func (c *FakeTerraforms) DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(terraformsResource, c.ns, listOpts)
- _, err := c.Fake.Invokes(action, &v1alpha1.TerraformList{})
+ _, err := c.Fake.Invokes(action, &v1beta1.TerraformList{})
return err
}
// Patch applies the patch and returns the patched terraform.
-func (c *FakeTerraforms) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha1.Terraform, err error) {
+func (c *FakeTerraforms) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.Terraform, err error) {
obj, err := c.Fake.
- Invokes(testing.NewPatchSubresourceAction(terraformsResource, c.ns, name, pt, data, subresources...), &v1alpha1.Terraform{})
+ Invokes(testing.NewPatchSubresourceAction(terraformsResource, c.ns, name, pt, data, subresources...), &v1beta1.Terraform{})
if obj == nil {
return nil, err
}
- return obj.(*v1alpha1.Terraform), err
+ return obj.(*v1beta1.Terraform), err
}
diff --git a/pkg/client/clientset/versioned/typed/tf/v1alpha1/fake/fake_tf_client.go b/pkg/client/clientset/versioned/typed/tf/v1beta1/fake/fake_tf_client.go
similarity index 77%
rename from pkg/client/clientset/versioned/typed/tf/v1alpha1/fake/fake_tf_client.go
rename to pkg/client/clientset/versioned/typed/tf/v1beta1/fake/fake_tf_client.go
index 520bac987b1c793511e940030a30aae61062a9a6..a63b74782ab55b1e1867d251a682956062c70f2d 100644
--- a/pkg/client/clientset/versioned/typed/tf/v1alpha1/fake/fake_tf_client.go
+++ b/pkg/client/clientset/versioned/typed/tf/v1beta1/fake/fake_tf_client.go
@@ -19,22 +19,22 @@ limitations under the License.
package fake
import (
- v1alpha1 "github.com/isaaguilar/terraform-operator/pkg/client/clientset/versioned/typed/tf/v1alpha1"
+ v1beta1 "github.com/galleybytes/terraform-operator/pkg/client/clientset/versioned/typed/tf/v1beta1"
rest "k8s.io/client-go/rest"
testing "k8s.io/client-go/testing"
)
-type FakeTfV1alpha1 struct {
+type FakeTfV1beta1 struct {
*testing.Fake
}
-func (c *FakeTfV1alpha1) Terraforms(namespace string) v1alpha1.TerraformInterface {
+func (c *FakeTfV1beta1) Terraforms(namespace string) v1beta1.TerraformInterface {
return &FakeTerraforms{c, namespace}
}
// RESTClient returns a RESTClient that is used to communicate
// with API server by this client implementation.
-func (c *FakeTfV1alpha1) RESTClient() rest.Interface {
+func (c *FakeTfV1beta1) RESTClient() rest.Interface {
var ret *rest.RESTClient
return ret
}
diff --git a/pkg/client/clientset/versioned/typed/tf/v1alpha1/generated_expansion.go b/pkg/client/clientset/versioned/typed/tf/v1beta1/generated_expansion.go
similarity index 97%
rename from pkg/client/clientset/versioned/typed/tf/v1alpha1/generated_expansion.go
rename to pkg/client/clientset/versioned/typed/tf/v1beta1/generated_expansion.go
index 7d3e03217fda09cf2654f1617bf325516697c1c1..9cc1a567620327d4d6470cc8ca3cb3783d3d359b 100644
--- a/pkg/client/clientset/versioned/typed/tf/v1alpha1/generated_expansion.go
+++ b/pkg/client/clientset/versioned/typed/tf/v1beta1/generated_expansion.go
@@ -16,6 +16,6 @@ limitations under the License.
// Code generated by client-gen. DO NOT EDIT.
-package v1alpha1
+package v1beta1
type TerraformExpansion interface{}
diff --git a/pkg/client/clientset/versioned/typed/tf/v1alpha2/terraform.go b/pkg/client/clientset/versioned/typed/tf/v1beta1/terraform.go
similarity index 77%
rename from pkg/client/clientset/versioned/typed/tf/v1alpha2/terraform.go
rename to pkg/client/clientset/versioned/typed/tf/v1beta1/terraform.go
index fa8cf215e85ba4ee9b66aece56e2dcc7b776a7ee..f67a62468266ae89b54865042867594bcec32592 100644
--- a/pkg/client/clientset/versioned/typed/tf/v1alpha2/terraform.go
+++ b/pkg/client/clientset/versioned/typed/tf/v1beta1/terraform.go
@@ -16,14 +16,14 @@ limitations under the License.
// Code generated by client-gen. DO NOT EDIT.
-package v1alpha2
+package v1beta1
import (
"context"
"time"
- v1alpha2 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2"
- scheme "github.com/isaaguilar/terraform-operator/pkg/client/clientset/versioned/scheme"
+ v1beta1 "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1"
+ scheme "github.com/galleybytes/terraform-operator/pkg/client/clientset/versioned/scheme"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
@@ -38,15 +38,15 @@ type TerraformsGetter interface {
// TerraformInterface has methods to work with Terraform resources.
type TerraformInterface interface {
- Create(ctx context.Context, terraform *v1alpha2.Terraform, opts v1.CreateOptions) (*v1alpha2.Terraform, error)
- Update(ctx context.Context, terraform *v1alpha2.Terraform, opts v1.UpdateOptions) (*v1alpha2.Terraform, error)
- UpdateStatus(ctx context.Context, terraform *v1alpha2.Terraform, opts v1.UpdateOptions) (*v1alpha2.Terraform, error)
+ Create(ctx context.Context, terraform *v1beta1.Terraform, opts v1.CreateOptions) (*v1beta1.Terraform, error)
+ Update(ctx context.Context, terraform *v1beta1.Terraform, opts v1.UpdateOptions) (*v1beta1.Terraform, error)
+ UpdateStatus(ctx context.Context, terraform *v1beta1.Terraform, opts v1.UpdateOptions) (*v1beta1.Terraform, error)
Delete(ctx context.Context, name string, opts v1.DeleteOptions) error
DeleteCollection(ctx context.Context, opts v1.DeleteOptions, listOpts v1.ListOptions) error
- Get(ctx context.Context, name string, opts v1.GetOptions) (*v1alpha2.Terraform, error)
- List(ctx context.Context, opts v1.ListOptions) (*v1alpha2.TerraformList, error)
+ Get(ctx context.Context, name string, opts v1.GetOptions) (*v1beta1.Terraform, error)
+ List(ctx context.Context, opts v1.ListOptions) (*v1beta1.TerraformList, error)
Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error)
- Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha2.Terraform, err error)
+ Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.Terraform, err error)
TerraformExpansion
}
@@ -57,7 +57,7 @@ type terraforms struct {
}
// newTerraforms returns a Terraforms
-func newTerraforms(c *TfV1alpha2Client, namespace string) *terraforms {
+func newTerraforms(c *TfV1beta1Client, namespace string) *terraforms {
return &terraforms{
client: c.RESTClient(),
ns: namespace,
@@ -65,8 +65,8 @@ func newTerraforms(c *TfV1alpha2Client, namespace string) *terraforms {
}
// Get takes name of the terraform, and returns the corresponding terraform object, and an error if there is any.
-func (c *terraforms) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha2.Terraform, err error) {
- result = &v1alpha2.Terraform{}
+func (c *terraforms) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1beta1.Terraform, err error) {
+ result = &v1beta1.Terraform{}
err = c.client.Get().
Namespace(c.ns).
Resource("terraforms").
@@ -78,12 +78,12 @@ func (c *terraforms) Get(ctx context.Context, name string, options v1.GetOptions
}
// List takes label and field selectors, and returns the list of Terraforms that match those selectors.
-func (c *terraforms) List(ctx context.Context, opts v1.ListOptions) (result *v1alpha2.TerraformList, err error) {
+func (c *terraforms) List(ctx context.Context, opts v1.ListOptions) (result *v1beta1.TerraformList, err error) {
var timeout time.Duration
if opts.TimeoutSeconds != nil {
timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
}
- result = &v1alpha2.TerraformList{}
+ result = &v1beta1.TerraformList{}
err = c.client.Get().
Namespace(c.ns).
Resource("terraforms").
@@ -110,8 +110,8 @@ func (c *terraforms) Watch(ctx context.Context, opts v1.ListOptions) (watch.Inte
}
// Create takes the representation of a terraform and creates it. Returns the server's representation of the terraform, and an error, if there is any.
-func (c *terraforms) Create(ctx context.Context, terraform *v1alpha2.Terraform, opts v1.CreateOptions) (result *v1alpha2.Terraform, err error) {
- result = &v1alpha2.Terraform{}
+func (c *terraforms) Create(ctx context.Context, terraform *v1beta1.Terraform, opts v1.CreateOptions) (result *v1beta1.Terraform, err error) {
+ result = &v1beta1.Terraform{}
err = c.client.Post().
Namespace(c.ns).
Resource("terraforms").
@@ -123,8 +123,8 @@ func (c *terraforms) Create(ctx context.Context, terraform *v1alpha2.Terraform,
}
// Update takes the representation of a terraform and updates it. Returns the server's representation of the terraform, and an error, if there is any.
-func (c *terraforms) Update(ctx context.Context, terraform *v1alpha2.Terraform, opts v1.UpdateOptions) (result *v1alpha2.Terraform, err error) {
- result = &v1alpha2.Terraform{}
+func (c *terraforms) Update(ctx context.Context, terraform *v1beta1.Terraform, opts v1.UpdateOptions) (result *v1beta1.Terraform, err error) {
+ result = &v1beta1.Terraform{}
err = c.client.Put().
Namespace(c.ns).
Resource("terraforms").
@@ -138,8 +138,8 @@ func (c *terraforms) Update(ctx context.Context, terraform *v1alpha2.Terraform,
// UpdateStatus was generated because the type contains a Status member.
// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *terraforms) UpdateStatus(ctx context.Context, terraform *v1alpha2.Terraform, opts v1.UpdateOptions) (result *v1alpha2.Terraform, err error) {
- result = &v1alpha2.Terraform{}
+func (c *terraforms) UpdateStatus(ctx context.Context, terraform *v1beta1.Terraform, opts v1.UpdateOptions) (result *v1beta1.Terraform, err error) {
+ result = &v1beta1.Terraform{}
err = c.client.Put().
Namespace(c.ns).
Resource("terraforms").
@@ -180,8 +180,8 @@ func (c *terraforms) DeleteCollection(ctx context.Context, opts v1.DeleteOptions
}
// Patch applies the patch and returns the patched terraform.
-func (c *terraforms) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1alpha2.Terraform, err error) {
- result = &v1alpha2.Terraform{}
+func (c *terraforms) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts v1.PatchOptions, subresources ...string) (result *v1beta1.Terraform, err error) {
+ result = &v1beta1.Terraform{}
err = c.client.Patch(pt).
Namespace(c.ns).
Resource("terraforms").
diff --git a/pkg/client/clientset/versioned/typed/tf/v1beta1/tf_client.go b/pkg/client/clientset/versioned/typed/tf/v1beta1/tf_client.go
new file mode 100644
index 0000000000000000000000000000000000000000..cfb0c544f3cf38c0fe3ad9afda16dc2c6be83b9e
--- /dev/null
+++ b/pkg/client/clientset/versioned/typed/tf/v1beta1/tf_client.go
@@ -0,0 +1,107 @@
+/*
+Copyright isaaguilar.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package v1beta1
+
+import (
+ "net/http"
+
+ v1beta1 "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1"
+ "github.com/galleybytes/terraform-operator/pkg/client/clientset/versioned/scheme"
+ rest "k8s.io/client-go/rest"
+)
+
+type TfV1beta1Interface interface {
+ RESTClient() rest.Interface
+ TerraformsGetter
+}
+
+// TfV1beta1Client is used to interact with features provided by the tf.galleybytes.com group.
+type TfV1beta1Client struct {
+ restClient rest.Interface
+}
+
+func (c *TfV1beta1Client) Terraforms(namespace string) TerraformInterface {
+ return newTerraforms(c, namespace)
+}
+
+// NewForConfig creates a new TfV1beta1Client for the given config.
+// NewForConfig is equivalent to NewForConfigAndClient(c, httpClient),
+// where httpClient was generated with rest.HTTPClientFor(c).
+func NewForConfig(c *rest.Config) (*TfV1beta1Client, error) {
+ config := *c
+ if err := setConfigDefaults(&config); err != nil {
+ return nil, err
+ }
+ httpClient, err := rest.HTTPClientFor(&config)
+ if err != nil {
+ return nil, err
+ }
+ return NewForConfigAndClient(&config, httpClient)
+}
+
+// NewForConfigAndClient creates a new TfV1beta1Client for the given config and http client.
+// Note the http client provided takes precedence over the configured transport values.
+func NewForConfigAndClient(c *rest.Config, h *http.Client) (*TfV1beta1Client, error) {
+ config := *c
+ if err := setConfigDefaults(&config); err != nil {
+ return nil, err
+ }
+ client, err := rest.RESTClientForConfigAndClient(&config, h)
+ if err != nil {
+ return nil, err
+ }
+ return &TfV1beta1Client{client}, nil
+}
+
+// NewForConfigOrDie creates a new TfV1beta1Client for the given config and
+// panics if there is an error in the config.
+func NewForConfigOrDie(c *rest.Config) *TfV1beta1Client {
+ client, err := NewForConfig(c)
+ if err != nil {
+ panic(err)
+ }
+ return client
+}
+
+// New creates a new TfV1beta1Client for the given RESTClient.
+func New(c rest.Interface) *TfV1beta1Client {
+ return &TfV1beta1Client{c}
+}
+
+func setConfigDefaults(config *rest.Config) error {
+ gv := v1beta1.SchemeGroupVersion
+ config.GroupVersion = &gv
+ config.APIPath = "/apis"
+ config.NegotiatedSerializer = scheme.Codecs.WithoutConversion()
+
+ if config.UserAgent == "" {
+ config.UserAgent = rest.DefaultKubernetesUserAgent()
+ }
+
+ return nil
+}
+
+// RESTClient returns a RESTClient that is used to communicate
+// with API server by this client implementation.
+func (c *TfV1beta1Client) RESTClient() rest.Interface {
+ if c == nil {
+ return nil
+ }
+ return c.restClient
+}
diff --git a/pkg/controllers/suite_test.go b/pkg/controllers/suite_test.go
deleted file mode 100644
index 1a9d3f5f195f10b4b151dea66c8990af2c44b7e4..0000000000000000000000000000000000000000
--- a/pkg/controllers/suite_test.go
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-Copyright isaaguilar.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package controllers
-
-import (
- "path/filepath"
- "testing"
-
- . "github.com/onsi/ginkgo"
- . "github.com/onsi/gomega"
- "k8s.io/client-go/kubernetes/scheme"
- "k8s.io/client-go/rest"
- ctrl "sigs.k8s.io/controller-runtime"
- "sigs.k8s.io/controller-runtime/pkg/client"
- "sigs.k8s.io/controller-runtime/pkg/envtest"
- "sigs.k8s.io/controller-runtime/pkg/envtest/printer"
- loge "sigs.k8s.io/controller-runtime/pkg/log"
- "sigs.k8s.io/controller-runtime/pkg/log/zap"
-
- tfv1alpha1 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1"
- // +kubebuilder:scaffold:imports
-)
-
-// These tests use Ginkgo (BDD-style Go testing framework). Refer to
-// http://onsi.github.io/ginkgo/ to learn more about Ginkgo.
-
-var cfg *rest.Config // TODO What is this for?
-var _ = cfg
-var k8sClient client.Client
-var testEnv *envtest.Environment
-
-func TestAPIs(t *testing.T) {
- RegisterFailHandler(Fail)
-
- RunSpecsWithDefaultAndCustomReporters(t,
- "Controller Suite",
- []Reporter{printer.NewlineReporter{}})
-}
-
-var _ = BeforeSuite(func(done Done) {
- loge.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
-
- By("bootstrapping test environment")
- testEnv = &envtest.Environment{
- CRDDirectoryPaths: []string{filepath.Join("..", "..", "deploy", "crds")},
- }
-
- cfg, err := testEnv.Start()
- Expect(err).NotTo(HaveOccurred())
- Expect(cfg).NotTo(BeNil())
-
- err = tfv1alpha1.AddToScheme(scheme.Scheme)
- Expect(err).NotTo(HaveOccurred())
-
- // +kubebuilder:scaffold:scheme
-
- k8sManager, err := ctrl.NewManager(cfg, ctrl.Options{
- Scheme: scheme.Scheme,
- })
- Expect(err).ToNot(HaveOccurred())
-
- err = (&ReconcileTerraform{
- Client: k8sManager.GetClient(),
- Scheme: k8sManager.GetScheme(),
- Recorder: k8sManager.GetEventRecorderFor("terraform-controller"),
- Log: ctrl.Log.WithName("controllers").WithName("Terraform"),
- }).SetupWithManager(k8sManager)
- Expect(err).ToNot(HaveOccurred())
-
- go func() {
- err = k8sManager.Start(ctrl.SetupSignalHandler())
- Expect(err).ToNot(HaveOccurred())
- }()
-
- k8sClient = k8sManager.GetClient()
- Expect(k8sClient).ToNot(BeNil())
-
- close(done)
-
-}, 60)
-
-var _ = AfterSuite(func() {
- By("tearing down the test environment")
- err := testEnv.Stop()
- Expect(err).NotTo(HaveOccurred())
-})
diff --git a/pkg/controllers/terraform_controller.go b/pkg/controllers/terraform_controller.go
index ae6777b6a1f6e778c3d71be484a9e046220c553b..7f17340ebdc008a59c6e1a0daaf3936d32487b50 100644
--- a/pkg/controllers/terraform_controller.go
+++ b/pkg/controllers/terraform_controller.go
@@ -13,10 +13,10 @@ import (
"time"
"github.com/MakeNowJust/heredoc"
+ tfv1beta1 "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1"
+ "github.com/galleybytes/terraform-operator/pkg/utils"
"github.com/go-logr/logr"
getter "github.com/hashicorp/go-getter"
- tfv1alpha2 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2"
- "github.com/isaaguilar/terraform-operator/pkg/utils"
localcache "github.com/patrickmn/go-cache"
appsv1 "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
@@ -35,9 +35,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
runtimecontroller "sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
- "sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
)
// ReconcileTerraform reconciles a Terraform object
@@ -78,7 +76,7 @@ type ReconcileTerraform struct {
// generate a new configap and secret. The reason for this is to prevent a generation from producing a
// different plan when is was the controller that changed options. A new generation should be forced
// if the plan needs to change.
-func (r ReconcileTerraform) createEnvFromSources(ctx context.Context, tf *tfv1alpha2.Terraform) error {
+func (r ReconcileTerraform) createEnvFromSources(ctx context.Context, tf *tfv1beta1.Terraform) error {
resourceName := tf.Name
resourceNamespace := tf.Namespace
@@ -136,7 +134,7 @@ func (r ReconcileTerraform) createEnvFromSources(ctx context.Context, tf *tfv1al
// This function will return the envFrom of the resources that should exist but does not validate that
// they do exist. If the configmap or secret is missing, force the generation of the tfo resource to update
// and the controller will recreate the missing resources.
-func (r ReconcileTerraform) listEnvFromSources(tf *tfv1alpha2.Terraform) []corev1.EnvFromSource {
+func (r ReconcileTerraform) listEnvFromSources(tf *tfv1beta1.Terraform) []corev1.EnvFromSource {
envFrom := []corev1.EnvFromSource{}
resourceName := tf.Name
name := fmt.Sprintf("%s-%s", resourceName, r.GlobalEnvSuffix)
@@ -172,13 +170,9 @@ func (r *ReconcileTerraform) SetupWithManager(mgr ctrl.Manager) error {
MaxConcurrentReconciles: r.MaxConcurrentReconciles,
}
- // only listen to v1alpha2
err := ctrl.NewControllerManagedBy(mgr).
- For(&tfv1alpha2.Terraform{}).
- Watches(&source.Kind{Type: &corev1.Pod{}}, &handler.EnqueueRequestForOwner{
- IsController: true,
- OwnerType: &tfv1alpha2.Terraform{},
- }).
+ For(&tfv1beta1.Terraform{}).
+ Owns(&corev1.Pod{}).
WithOptions(controllerOptions).
Complete(r)
if err != nil {
@@ -235,7 +229,7 @@ type TaskOptions struct {
annotations map[string]string
configMapSourceName string
configMapSourceKey string
- credentials []tfv1alpha2.Credentials
+ credentials []tfv1beta1.Credentials
env []corev1.EnvVar
envFrom []corev1.EnvFromSource
generation int64
@@ -255,7 +249,7 @@ type TaskOptions struct {
resourceLabels map[string]string
resourceName string
resourceUUID string
- task tfv1alpha2.TaskName
+ task tfv1beta1.TaskName
saveOutputs bool
secretData map[string][]byte
serviceAccount string
@@ -269,7 +263,7 @@ type TaskOptions struct {
restartPolicy corev1.RestartPolicy
}
-func newTaskOptions(tf *tfv1alpha2.Terraform, task tfv1alpha2.TaskName, generation int64, globalEnvFrom []corev1.EnvFromSource, affinity *corev1.Affinity, nodeSelector map[string]string, tolerations []corev1.Toleration) TaskOptions {
+func newTaskOptions(tf *tfv1beta1.Terraform, task tfv1beta1.TaskName, generation int64, globalEnvFrom []corev1.EnvFromSource, affinity *corev1.Affinity, nodeSelector map[string]string, tolerations []corev1.Toleration) TaskOptions {
// TODO Read the tfstate and decide IF_NEW_RESOURCE based on that
// applyAction := false
resourceName := tf.Name
@@ -297,8 +291,8 @@ func newTaskOptions(tf *tfv1alpha2.Terraform, task tfv1alpha2.TaskName, generati
// TaskOptions have data for all the tasks but since we're only interested
// in the ones for this taskType, extract and add them to RunOptions
for _, taskOption := range tf.Spec.TaskOptions {
- if tfv1alpha2.ListContainsTask(taskOption.For, task) ||
- tfv1alpha2.ListContainsTask(taskOption.For, "*") {
+ if tfv1beta1.ListContainsTask(taskOption.For, task) ||
+ tfv1beta1.ListContainsTask(taskOption.For, "*") {
policyRules = append(policyRules, taskOption.PolicyRules...)
for key, value := range taskOption.Annotations {
annotations[key] = value
@@ -312,7 +306,7 @@ func newTaskOptions(tf *tfv1alpha2.Terraform, task tfv1alpha2.TaskName, generati
restartPolicy = taskOption.RestartPolicy
}
}
- if tfv1alpha2.ListContainsTask(taskOption.For, task) {
+ if tfv1beta1.ListContainsTask(taskOption.For, task) {
urlSource = taskOption.Script.Source
if configMapSelector := taskOption.Script.ConfigMapSelector; configMapSelector != nil {
configMapSourceName = configMapSelector.Name
@@ -324,17 +318,17 @@ func newTaskOptions(tf *tfv1alpha2.Terraform, task tfv1alpha2.TaskName, generati
images := tf.Spec.Images
if images == nil {
// setup default images
- images = &tfv1alpha2.Images{}
+ images = &tfv1beta1.Images{}
}
if images.Terraform == nil {
- images.Terraform = &tfv1alpha2.ImageConfig{
+ images.Terraform = &tfv1beta1.ImageConfig{
ImagePullPolicy: corev1.PullIfNotPresent,
}
}
if images.Terraform.Image == "" {
- images.Terraform.Image = fmt.Sprintf("%s:%s", tfv1alpha2.TerraformTaskImageRepoDefault, terraformVersion)
+ images.Terraform.Image = fmt.Sprintf("%s:%s", tfv1beta1.TerraformTaskImageRepoDefault, terraformVersion)
} else {
terraformImage := images.Terraform.Image
splitImage := strings.Split(images.Terraform.Image, ":")
@@ -345,67 +339,67 @@ func newTaskOptions(tf *tfv1alpha2.Terraform, task tfv1alpha2.TaskName, generati
}
if images.Setup == nil {
- images.Setup = &tfv1alpha2.ImageConfig{
+ images.Setup = &tfv1beta1.ImageConfig{
ImagePullPolicy: corev1.PullIfNotPresent,
}
}
if images.Setup.Image == "" {
- images.Setup.Image = fmt.Sprintf("%s:%s", tfv1alpha2.SetupTaskImageRepoDefault, tfv1alpha2.SetupTaskImageTagDefault)
+ images.Setup.Image = fmt.Sprintf("%s:%s", tfv1beta1.SetupTaskImageRepoDefault, tfv1beta1.SetupTaskImageTagDefault)
}
if images.Script == nil {
- images.Script = &tfv1alpha2.ImageConfig{
+ images.Script = &tfv1beta1.ImageConfig{
ImagePullPolicy: corev1.PullIfNotPresent,
}
}
if images.Script.Image == "" {
- images.Script.Image = fmt.Sprintf("%s:%s", tfv1alpha2.ScriptTaskImageRepoDefault, tfv1alpha2.ScriptTaskImageTagDefault)
+ images.Script.Image = fmt.Sprintf("%s:%s", tfv1beta1.ScriptTaskImageRepoDefault, tfv1beta1.ScriptTaskImageTagDefault)
}
- terraformTasks := []tfv1alpha2.TaskName{
- tfv1alpha2.RunInit,
- tfv1alpha2.RunInitDelete,
- tfv1alpha2.RunPlan,
- tfv1alpha2.RunPlanDelete,
- tfv1alpha2.RunApply,
- tfv1alpha2.RunApplyDelete,
+ terraformTasks := []tfv1beta1.TaskName{
+ tfv1beta1.RunInit,
+ tfv1beta1.RunInitDelete,
+ tfv1beta1.RunPlan,
+ tfv1beta1.RunPlanDelete,
+ tfv1beta1.RunApply,
+ tfv1beta1.RunApplyDelete,
}
- scriptTasks := []tfv1alpha2.TaskName{
- tfv1alpha2.RunPreInit,
- tfv1alpha2.RunPreInitDelete,
- tfv1alpha2.RunPostInit,
- tfv1alpha2.RunPostInitDelete,
- tfv1alpha2.RunPrePlan,
- tfv1alpha2.RunPrePlanDelete,
- tfv1alpha2.RunPostPlan,
- tfv1alpha2.RunPostPlanDelete,
- tfv1alpha2.RunPreApply,
- tfv1alpha2.RunPreApplyDelete,
- tfv1alpha2.RunPostApply,
- tfv1alpha2.RunPostApplyDelete,
+ scriptTasks := []tfv1beta1.TaskName{
+ tfv1beta1.RunPreInit,
+ tfv1beta1.RunPreInitDelete,
+ tfv1beta1.RunPostInit,
+ tfv1beta1.RunPostInitDelete,
+ tfv1beta1.RunPrePlan,
+ tfv1beta1.RunPrePlanDelete,
+ tfv1beta1.RunPostPlan,
+ tfv1beta1.RunPostPlanDelete,
+ tfv1beta1.RunPreApply,
+ tfv1beta1.RunPreApplyDelete,
+ tfv1beta1.RunPostApply,
+ tfv1beta1.RunPostApplyDelete,
}
- setupTasks := []tfv1alpha2.TaskName{
- tfv1alpha2.RunSetup,
- tfv1alpha2.RunSetupDelete,
+ setupTasks := []tfv1beta1.TaskName{
+ tfv1beta1.RunSetup,
+ tfv1beta1.RunSetupDelete,
}
- if tfv1alpha2.ListContainsTask(terraformTasks, task) {
+ if tfv1beta1.ListContainsTask(terraformTasks, task) {
image = images.Terraform.Image
imagePullPolicy = images.Terraform.ImagePullPolicy
if urlSource == "" {
urlSource = "https://raw.githubusercontent.com/GalleyBytes/terraform-operator-tasks/master/tf.sh"
}
- } else if tfv1alpha2.ListContainsTask(scriptTasks, task) {
+ } else if tfv1beta1.ListContainsTask(scriptTasks, task) {
image = images.Script.Image
imagePullPolicy = images.Script.ImagePullPolicy
if urlSource == "" {
urlSource = "https://raw.githubusercontent.com/GalleyBytes/terraform-operator-tasks/master/noop.sh"
}
- } else if tfv1alpha2.ListContainsTask(setupTasks, task) {
+ } else if tfv1beta1.ListContainsTask(setupTasks, task) {
image = images.Setup.Image
imagePullPolicy = images.Setup.ImagePullPolicy
if urlSource == "" {
@@ -443,20 +437,20 @@ func newTaskOptions(tf *tfv1alpha2.Terraform, task tfv1alpha2.TaskName, generati
}
resourceLabels := map[string]string{
- "terraforms.tf.isaaguilar.com/generation": fmt.Sprintf("%d", generation),
- "terraforms.tf.isaaguilar.com/resourceName": resourceName,
- "terraforms.tf.isaaguilar.com/podPrefix": prefixedName,
- "terraforms.tf.isaaguilar.com/terraformVersion": terraformVersion,
- "app.kubernetes.io/name": "terraform-operator",
- "app.kubernetes.io/component": "terraform-operator-runner",
- "app.kubernetes.io/created-by": "controller",
+ "terraforms.tf.galleybytes.com/generation": fmt.Sprintf("%d", generation),
+ "terraforms.tf.galleybytes.com/resourceName": resourceName,
+ "terraforms.tf.galleybytes.com/podPrefix": prefixedName,
+ "terraforms.tf.galleybytes.com/terraformVersion": terraformVersion,
+ "app.kubernetes.io/name": "terraform-operator",
+ "app.kubernetes.io/component": "terraform-operator-runner",
+ "app.kubernetes.io/created-by": "controller",
}
requireApproval := tf.Spec.RequireApproval
if task.ID() == -2 {
// This is not one of the main tasks so it's probably an plugin
- resourceLabels["terraforms.tf.isaaguilar.com/isPlugin"] = "true"
+ resourceLabels["terraforms.tf.galleybytes.com/isPlugin"] = "true"
}
return TaskOptions{
@@ -497,7 +491,7 @@ func newTaskOptions(tf *tfv1alpha2.Terraform, task tfv1alpha2.TaskName, generati
}
}
-const terraformFinalizer = "finalizer.tf.isaaguilar.com"
+const terraformFinalizer = "finalizer.tf.galleybytes.com"
// Reconcile reads that state of the cluster for a Terraform object and makes changes based on the state read
// and what is in the Terraform.Spec
@@ -538,7 +532,7 @@ func (r *ReconcileTerraform) Reconcile(ctx context.Context, request reconcile.Re
}
// Final delete by removing finalizers
- if tf.Status.Phase == tfv1alpha2.PhaseDeleted {
+ if tf.Status.Phase == tfv1beta1.PhaseDeleted {
reqLogger.Info("Remove finalizers")
_ = updateFinalizer(tf)
err := r.update(ctx, tf)
@@ -568,9 +562,9 @@ func (r *ReconcileTerraform) Reconcile(ctx context.Context, request reconcile.Re
utils.TruncateResourceName(tf.Name, 220),
utils.StringWithCharset(8, utils.AlphaNum),
)
- tf.Status.Stages = []tfv1alpha2.Stage{}
+ tf.Status.Stages = []tfv1beta1.Stage{}
tf.Status.LastCompletedGeneration = 0
- tf.Status.Phase = tfv1alpha2.PhaseInitializing
+ tf.Status.Phase = tfv1beta1.PhaseInitializing
err := r.updateStatusWithRetry(ctx, tf, &tf.Status, reqLogger)
if err != nil {
@@ -581,15 +575,15 @@ func (r *ReconcileTerraform) Reconcile(ctx context.Context, request reconcile.Re
// Add the first stage
if tf.Status.Stage.Generation == 0 {
- task := tfv1alpha2.RunSetup
- stageState := tfv1alpha2.StateInitializing
- interruptible := tfv1alpha2.CanNotBeInterrupt
+ task := tfv1beta1.RunSetup
+ stageState := tfv1beta1.StateInitializing
+ interruptible := tfv1beta1.CanNotBeInterrupt
stage := newStage(tf, task, "TF_RESOURCE_CREATED", interruptible, stageState)
if stage == nil {
return reconcile.Result{}, fmt.Errorf("failed to create a new stage")
}
tf.Status.Stage = *stage
- tf.Status.Plugins = []tfv1alpha2.TaskName{}
+ tf.Status.Plugins = []tfv1beta1.TaskName{}
err := r.updateStatusWithRetry(ctx, tf, &tf.Status, reqLogger)
if err != nil {
@@ -599,15 +593,15 @@ func (r *ReconcileTerraform) Reconcile(ctx context.Context, request reconcile.Re
}
deletePhases := []string{
- string(tfv1alpha2.PhaseDeleting),
- string(tfv1alpha2.PhaseInitDelete),
- string(tfv1alpha2.PhaseDeleted),
+ string(tfv1beta1.PhaseDeleting),
+ string(tfv1beta1.PhaseInitDelete),
+ string(tfv1beta1.PhaseDeleted),
}
// Check if the resource is marked to be deleted which is
// indicated by the deletion timestamp being set.
if tf.GetDeletionTimestamp() != nil && !utils.ListContainsStr(deletePhases, string(tf.Status.Phase)) {
- tf.Status.Phase = tfv1alpha2.PhaseInitDelete
+ tf.Status.Phase = tfv1beta1.PhaseInitDelete
}
// // TODO Check the status on stages that have not completed
@@ -645,13 +639,13 @@ func (r *ReconcileTerraform) Reconcile(ctx context.Context, request reconcile.Re
affinity, nodeSelector, tolerations := r.getNodeSelectorsFromCache()
runOpts := newTaskOptions(tf, currentStage.TaskType, generation, globalEnvFrom, affinity, nodeSelector, tolerations)
- if podType == tfv1alpha2.RunNil {
+ if podType == tfv1beta1.RunNil {
// podType is blank when the terraform workflow has completed for
// either create or delete.
- if tf.Status.Phase == tfv1alpha2.PhaseRunning {
+ if tf.Status.Phase == tfv1beta1.PhaseRunning {
// Updates the status as "completed" on the resource
- tf.Status.Phase = tfv1alpha2.PhaseCompleted
+ tf.Status.Phase = tfv1beta1.PhaseCompleted
if tf.Spec.WriteOutputsToStatus {
// runOpts.outputsSecetName
secret, err := r.loadSecret(ctx, runOpts.outputsSecretName, runOpts.namespace)
@@ -681,10 +675,10 @@ func (r *ReconcileTerraform) Reconcile(ctx context.Context, request reconcile.Re
reqLogger.V(1).Info(err.Error())
return reconcile.Result{}, err
}
- } else if tf.Status.Phase == tfv1alpha2.PhaseDeleting {
+ } else if tf.Status.Phase == tfv1beta1.PhaseDeleting {
// Updates the status as "deleted" which will be used to tell the
// controller to remove any finalizers).
- tf.Status.Phase = tfv1alpha2.PhaseDeleted
+ tf.Status.Phase = tfv1beta1.PhaseDeleted
err := r.updateStatusWithRetry(ctx, tf, &tf.Status, reqLogger)
if err != nil {
reqLogger.V(1).Info(err.Error())
@@ -700,7 +694,7 @@ func (r *ReconcileTerraform) Reconcile(ctx context.Context, request reconcile.Re
"metadata.generateName": fmt.Sprintf("%s-%s-", tf.Status.PodNamePrefix+"-v"+fmt.Sprint(generation), podType),
}
labelSelector := map[string]string{
- "terraforms.tf.isaaguilar.com/generation": fmt.Sprintf("%d", generation),
+ "terraforms.tf.galleybytes.com/generation": fmt.Sprintf("%d", generation),
}
matchingFields := client.MatchingFields(f)
matchingLabels := client.MatchingLabels(labelSelector)
@@ -711,11 +705,11 @@ func (r *ReconcileTerraform) Reconcile(ctx context.Context, request reconcile.Re
return reconcile.Result{}, nil
}
- if len(pods.Items) == 0 && tf.Status.Stage.State == tfv1alpha2.StateInProgress {
+ if len(pods.Items) == 0 && tf.Status.Stage.State == tfv1beta1.StateInProgress {
// This condition is generally met when the user deletes the pod.
// Force the state to transition away from in-progress and then
// requeue.
- tf.Status.Stage.State = tfv1alpha2.StateInitializing
+ tf.Status.Stage.State = tfv1beta1.StateInitializing
err = r.updateStatusWithRetry(ctx, tf, &tf.Status, reqLogger)
if err != nil {
reqLogger.V(1).Info(err.Error())
@@ -732,12 +726,12 @@ func (r *ReconcileTerraform) Reconcile(ctx context.Context, request reconcile.Re
reqLogger.Error(err, "")
return reconcile.Result{}, err
}
- if tf.Status.Phase == tfv1alpha2.PhaseInitializing {
- tf.Status.Phase = tfv1alpha2.PhaseRunning
- } else if tf.Status.Phase == tfv1alpha2.PhaseInitDelete {
- tf.Status.Phase = tfv1alpha2.PhaseDeleting
+ if tf.Status.Phase == tfv1beta1.PhaseInitializing {
+ tf.Status.Phase = tfv1beta1.PhaseRunning
+ } else if tf.Status.Phase == tfv1beta1.PhaseInitDelete {
+ tf.Status.Phase = tfv1beta1.PhaseDeleting
}
- tf.Status.Stage.State = tfv1alpha2.StateInProgress
+ tf.Status.Stage.State = tfv1beta1.StateInProgress
// TODO because the pod is already running, is it critical that the
// phase and state be updated. The updateStatus function needs to retry
@@ -754,7 +748,7 @@ func (r *ReconcileTerraform) Reconcile(ctx context.Context, request reconcile.Re
// By now, the task pod exists and the controller has to check and update on the status of the pod.
for pluginTaskName, pluginConfig := range tf.Spec.Plugins {
- if tfv1alpha2.ListContainsTask(tf.Status.Plugins, pluginTaskName) {
+ if tfv1beta1.ListContainsTask(tf.Status.Plugins, pluginTaskName) {
continue
}
@@ -805,7 +799,7 @@ func (r *ReconcileTerraform) Reconcile(ctx context.Context, request reconcile.Re
// }
if realPod.Status.Phase == corev1.PodFailed {
- tf.Status.Stage.State = tfv1alpha2.StateFailed
+ tf.Status.Stage.State = tfv1beta1.StateFailed
tf.Status.Stage.StopTime = metav1.NewTime(time.Now())
err = r.updateStatusWithRetry(ctx, tf, &tf.Status, reqLogger)
if err != nil {
@@ -816,7 +810,7 @@ func (r *ReconcileTerraform) Reconcile(ctx context.Context, request reconcile.Re
}
if realPod.Status.Phase == corev1.PodSucceeded {
- tf.Status.Stage.State = tfv1alpha2.StateComplete
+ tf.Status.Stage.State = tfv1beta1.StateComplete
tf.Status.Stage.StopTime = metav1.NewTime(time.Now())
err = r.updateStatusWithRetry(ctx, tf, &tf.Status, reqLogger)
if err != nil {
@@ -831,7 +825,7 @@ func (r *ReconcileTerraform) Reconcile(ctx context.Context, request reconcile.Re
}
return reconcile.Result{}, nil
}
- tf.Status.Stage.State = tfv1alpha2.StageState(realPod.Status.Phase)
+ tf.Status.Stage.State = tfv1beta1.StageState(realPod.Status.Phase)
// Finally, update any statuses that have been changed if not already saved. This is probablye
// for pending condition that does not require anything to be done.
@@ -847,8 +841,8 @@ func (r *ReconcileTerraform) Reconcile(ctx context.Context, request reconcile.Re
}
// getTerraformResource fetches the terraform resource with a retry
-func (r ReconcileTerraform) getTerraformResource(ctx context.Context, namespacedName types.NamespacedName, maxRetry int, reqLogger logr.Logger) (*tfv1alpha2.Terraform, error) {
- tf := &tfv1alpha2.Terraform{}
+func (r ReconcileTerraform) getTerraformResource(ctx context.Context, namespacedName types.NamespacedName, maxRetry int, reqLogger logr.Logger) (*tfv1beta1.Terraform, error) {
+ tf := &tfv1beta1.Terraform{}
for retryCount := 1; retryCount <= maxRetry; retryCount++ {
err := r.Client.Get(ctx, namespacedName, tf)
if err != nil {
@@ -866,17 +860,17 @@ func (r ReconcileTerraform) getTerraformResource(ctx context.Context, namespaced
return tf, nil
}
-func newStage(tf *tfv1alpha2.Terraform, taskType tfv1alpha2.TaskName, reason string, interruptible tfv1alpha2.Interruptible, stageState tfv1alpha2.StageState) *tfv1alpha2.Stage {
+func newStage(tf *tfv1beta1.Terraform, taskType tfv1beta1.TaskName, reason string, interruptible tfv1beta1.Interruptible, stageState tfv1beta1.StageState) *tfv1beta1.Stage {
if reason == "GENERATION_CHANGE" {
- tf.Status.Plugins = []tfv1alpha2.TaskName{}
- tf.Status.Phase = tfv1alpha2.PhaseInitializing
+ tf.Status.Plugins = []tfv1beta1.TaskName{}
+ tf.Status.Phase = tfv1beta1.PhaseInitializing
}
startTime := metav1.NewTime(time.Now())
stopTime := metav1.NewTime(time.Unix(0, 0))
- if stageState == tfv1alpha2.StateComplete {
+ if stageState == tfv1beta1.StateComplete {
stopTime = startTime
}
- return &tfv1alpha2.Stage{
+ return &tfv1beta1.Stage{
Generation: tf.Generation,
Interruptible: interruptible,
Reason: reason,
@@ -887,16 +881,16 @@ func newStage(tf *tfv1alpha2.Terraform, taskType tfv1alpha2.TaskName, reason str
}
}
-func getConfiguredTasks(taskOptions *[]tfv1alpha2.TaskOption) []tfv1alpha2.TaskName {
- tasks := []tfv1alpha2.TaskName{
- tfv1alpha2.RunSetup,
- tfv1alpha2.RunInit,
- tfv1alpha2.RunPlan,
- tfv1alpha2.RunApply,
- tfv1alpha2.RunSetupDelete,
- tfv1alpha2.RunInitDelete,
- tfv1alpha2.RunPlanDelete,
- tfv1alpha2.RunApplyDelete,
+func getConfiguredTasks(taskOptions *[]tfv1beta1.TaskOption) []tfv1beta1.TaskName {
+ tasks := []tfv1beta1.TaskName{
+ tfv1beta1.RunSetup,
+ tfv1beta1.RunInit,
+ tfv1beta1.RunPlan,
+ tfv1beta1.RunApply,
+ tfv1beta1.RunSetupDelete,
+ tfv1beta1.RunInitDelete,
+ tfv1beta1.RunPlanDelete,
+ tfv1beta1.RunApplyDelete,
}
if taskOptions == nil {
return tasks
@@ -906,7 +900,7 @@ func getConfiguredTasks(taskOptions *[]tfv1alpha2.TaskOption) []tfv1alpha2.TaskN
if affected == "*" {
continue
}
- if !tfv1alpha2.ListContainsTask(tasks, affected) {
+ if !tfv1beta1.ListContainsTask(tasks, affected) {
tasks = append(tasks, affected)
}
}
@@ -928,27 +922,27 @@ func getConfiguredTasks(taskOptions *[]tfv1alpha2.TaskOption) []tfv1alpha2.TaskN
// When a stage has already triggered a pod, the only way for the pod to transition to the next stage is for
// the pod to complete successfully. Any other pod phase will keep the pod in the current stage, or in the
// case of the apply task, the workflow will be restarted.
-func (r ReconcileTerraform) checkSetNewStage(ctx context.Context, tf *tfv1alpha2.Terraform) *tfv1alpha2.Stage {
+func (r ReconcileTerraform) checkSetNewStage(ctx context.Context, tf *tfv1beta1.Terraform) *tfv1beta1.Stage {
var isNewStage bool
- var podType tfv1alpha2.TaskName
+ var podType tfv1beta1.TaskName
var reason string
configuredTasks := getConfiguredTasks(&tf.Spec.TaskOptions)
deletePhases := []string{
- string(tfv1alpha2.PhaseDeleted),
- string(tfv1alpha2.PhaseInitDelete),
- string(tfv1alpha2.PhaseDeleted),
+ string(tfv1beta1.PhaseDeleted),
+ string(tfv1beta1.PhaseInitDelete),
+ string(tfv1beta1.PhaseDeleted),
}
tfIsFinalizing := utils.ListContainsStr(deletePhases, string(tf.Status.Phase))
tfIsNotFinalizing := !tfIsFinalizing
- initDelete := tf.Status.Phase == tfv1alpha2.PhaseInitDelete
- stageState := tfv1alpha2.StateInitializing
- interruptible := tfv1alpha2.CanBeInterrupt
+ initDelete := tf.Status.Phase == tfv1beta1.PhaseInitDelete
+ stageState := tfv1beta1.StateInitializing
+ interruptible := tfv1beta1.CanBeInterrupt
currentStage := tf.Status.Stage
currentStagePodType := currentStage.TaskType
- currentStageCanNotBeInterrupted := currentStage.Interruptible == tfv1alpha2.CanNotBeInterrupt
- currentStageIsRunning := currentStage.State == tfv1alpha2.StateInProgress
+ currentStageCanNotBeInterrupted := currentStage.Interruptible == tfv1beta1.CanNotBeInterrupt
+ currentStageIsRunning := currentStage.State == tfv1beta1.StateInProgress
isNewGeneration := currentStage.Generation != tf.Generation
// resource status
@@ -961,7 +955,7 @@ func (r ReconcileTerraform) checkSetNewStage(ctx context.Context, tf *tfv1alpha2
// normal terraform workflow
isNewStage = true
reason = "GENERATION_CHANGE"
- podType = tfv1alpha2.RunSetup
+ podType = tfv1beta1.RunSetup
// } else if initDelete && !utils.ListContainsStr(deletePodTypes, string(currentStagePodType)) {
} else if initDelete && isNewGeneration {
@@ -969,44 +963,44 @@ func (r ReconcileTerraform) checkSetNewStage(ctx context.Context, tf *tfv1alpha2
// in the terraform destroy workflow.
isNewStage = true
reason = "TF_RESOURCE_DELETED"
- podType = tfv1alpha2.RunSetupDelete
- interruptible = tfv1alpha2.CanNotBeInterrupt
+ podType = tfv1beta1.RunSetupDelete
+ interruptible = tfv1beta1.CanNotBeInterrupt
- } else if currentStage.State == tfv1alpha2.StateComplete {
+ } else if currentStage.State == tfv1beta1.StateComplete {
isNewStage = true
reason = fmt.Sprintf("COMPLETED_%s", strings.ToUpper(currentStage.TaskType.String()))
switch currentStagePodType {
- case tfv1alpha2.RunNil:
+ case tfv1beta1.RunNil:
isNewStage = false
default:
podType = nextTask(currentStagePodType, configuredTasks)
interruptible = isTaskInterruptable(podType)
- if podType == tfv1alpha2.RunNil {
- stageState = tfv1alpha2.StateComplete
+ if podType == tfv1beta1.RunNil {
+ stageState = tfv1beta1.StateComplete
}
}
- } else if currentStage.State == tfv1alpha2.StateFailed {
- if currentStage.TaskType == tfv1alpha2.RunApply {
+ } else if currentStage.State == tfv1beta1.StateFailed {
+ if currentStage.TaskType == tfv1beta1.RunApply {
err := r.Client.Get(ctx, types.NamespacedName{Namespace: tf.Namespace, Name: tf.Status.Stage.PodName}, &corev1.Pod{})
if err != nil && errors.IsNotFound(err) {
// If the task failed, is of type "apply", and the pod does not exist, restart the workflow.
isNewStage = true
reason = "RESTARTED_WORKFLOW"
- podType = nextTask(tfv1alpha2.RunPostInit, configuredTasks)
+ podType = nextTask(tfv1beta1.RunPostInit, configuredTasks)
interruptible = isTaskInterruptable(podType)
}
- } else if currentStage.TaskType == tfv1alpha2.RunApplyDelete {
+ } else if currentStage.TaskType == tfv1beta1.RunApplyDelete {
pod := corev1.Pod{}
err := r.Client.Get(ctx, types.NamespacedName{Namespace: tf.Namespace, Name: tf.Status.Stage.PodName}, &pod)
if err != nil && errors.IsNotFound(err) {
// If the task failed, is of type "apply", and the pod does not exist, restart the workflow.
isNewStage = true
reason = "RESTARTED_DELETE_WORKFLOW"
- podType = nextTask(tfv1alpha2.RunPostInitDelete, configuredTasks)
+ podType = nextTask(tfv1beta1.RunPostInitDelete, configuredTasks)
interruptible = isTaskInterruptable(podType)
}
}
@@ -1019,25 +1013,25 @@ func (r ReconcileTerraform) checkSetNewStage(ctx context.Context, tf *tfv1alpha2
}
-func (r ReconcileTerraform) removeOldPlan(tf *tfv1alpha2.Terraform) error {
+func (r ReconcileTerraform) removeOldPlan(tf *tfv1beta1.Terraform) error {
labelSelectors := []string{
- fmt.Sprintf("terraforms.tf.isaaguilar.com/generation==%d", tf.Generation),
- fmt.Sprintf("terraforms.tf.isaaguilar.com/resourceName=%s", tf.Name),
+ fmt.Sprintf("terraforms.tf.galleybytes.com/generation==%d", tf.Generation),
+ fmt.Sprintf("terraforms.tf.galleybytes.com/resourceName=%s", tf.Name),
"app.kubernetes.io/instance",
}
if tf.Status.Stage.Reason == "RESTARTED_WORKFLOW" {
labelSelectors = append(labelSelectors, []string{
- fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1alpha2.RunSetup),
- fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1alpha2.RunPreInit),
- fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1alpha2.RunInit),
- fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1alpha2.RunPostInit),
+ fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1beta1.RunSetup),
+ fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1beta1.RunPreInit),
+ fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1beta1.RunInit),
+ fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1beta1.RunPostInit),
}...)
} else if tf.Status.Stage.Reason == "RESTARTED_DELETE_WORKFLOW" {
labelSelectors = append(labelSelectors, []string{
- fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1alpha2.RunSetupDelete),
- fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1alpha2.RunPreInitDelete),
- fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1alpha2.RunInitDelete),
- fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1alpha2.RunPostInitDelete),
+ fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1beta1.RunSetupDelete),
+ fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1beta1.RunPreInitDelete),
+ fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1beta1.RunInitDelete),
+ fmt.Sprintf("app.kubernetes.io/instance!=%s", tfv1beta1.RunPostInitDelete),
}...)
}
labelSelector, err := labels.Parse(strings.Join(labelSelectors, ","))
@@ -1063,67 +1057,67 @@ func (r ReconcileTerraform) removeOldPlan(tf *tfv1alpha2.Terraform) error {
// These are pods that are known to cause issues with terraform state when
// not run to completion.
-func isTaskInterruptable(task tfv1alpha2.TaskName) tfv1alpha2.Interruptible {
- uninterruptibleTasks := []tfv1alpha2.TaskName{
- tfv1alpha2.RunInit,
- tfv1alpha2.RunPlan,
- tfv1alpha2.RunApply,
- tfv1alpha2.RunInitDelete,
- tfv1alpha2.RunPlanDelete,
- tfv1alpha2.RunApplyDelete,
- }
- if tfv1alpha2.ListContainsTask(uninterruptibleTasks, task) {
- return tfv1alpha2.CanNotBeInterrupt
- }
- return tfv1alpha2.CanBeInterrupt
+func isTaskInterruptable(task tfv1beta1.TaskName) tfv1beta1.Interruptible {
+ uninterruptibleTasks := []tfv1beta1.TaskName{
+ tfv1beta1.RunInit,
+ tfv1beta1.RunPlan,
+ tfv1beta1.RunApply,
+ tfv1beta1.RunInitDelete,
+ tfv1beta1.RunPlanDelete,
+ tfv1beta1.RunApplyDelete,
+ }
+ if tfv1beta1.ListContainsTask(uninterruptibleTasks, task) {
+ return tfv1beta1.CanNotBeInterrupt
+ }
+ return tfv1beta1.CanBeInterrupt
}
-func nextTask(currentTask tfv1alpha2.TaskName, configuredTasks []tfv1alpha2.TaskName) tfv1alpha2.TaskName {
- tasksInOrder := []tfv1alpha2.TaskName{
- tfv1alpha2.RunSetup,
- tfv1alpha2.RunPreInit,
- tfv1alpha2.RunInit,
- tfv1alpha2.RunPostInit,
- tfv1alpha2.RunPrePlan,
- tfv1alpha2.RunPlan,
- tfv1alpha2.RunPostPlan,
- tfv1alpha2.RunPreApply,
- tfv1alpha2.RunApply,
- tfv1alpha2.RunPostApply,
- }
- deleteTasksInOrder := []tfv1alpha2.TaskName{
- tfv1alpha2.RunSetupDelete,
- tfv1alpha2.RunPreInitDelete,
- tfv1alpha2.RunInitDelete,
- tfv1alpha2.RunPostInitDelete,
- tfv1alpha2.RunPrePlanDelete,
- tfv1alpha2.RunPlanDelete,
- tfv1alpha2.RunPostPlanDelete,
- tfv1alpha2.RunPreApplyDelete,
- tfv1alpha2.RunApplyDelete,
- tfv1alpha2.RunPostApplyDelete,
- }
-
- next := tfv1alpha2.RunNil
+func nextTask(currentTask tfv1beta1.TaskName, configuredTasks []tfv1beta1.TaskName) tfv1beta1.TaskName {
+ tasksInOrder := []tfv1beta1.TaskName{
+ tfv1beta1.RunSetup,
+ tfv1beta1.RunPreInit,
+ tfv1beta1.RunInit,
+ tfv1beta1.RunPostInit,
+ tfv1beta1.RunPrePlan,
+ tfv1beta1.RunPlan,
+ tfv1beta1.RunPostPlan,
+ tfv1beta1.RunPreApply,
+ tfv1beta1.RunApply,
+ tfv1beta1.RunPostApply,
+ }
+ deleteTasksInOrder := []tfv1beta1.TaskName{
+ tfv1beta1.RunSetupDelete,
+ tfv1beta1.RunPreInitDelete,
+ tfv1beta1.RunInitDelete,
+ tfv1beta1.RunPostInitDelete,
+ tfv1beta1.RunPrePlanDelete,
+ tfv1beta1.RunPlanDelete,
+ tfv1beta1.RunPostPlanDelete,
+ tfv1beta1.RunPreApplyDelete,
+ tfv1beta1.RunApplyDelete,
+ tfv1beta1.RunPostApplyDelete,
+ }
+
+ next := tfv1beta1.RunNil
isUpNext := false
- if tfv1alpha2.ListContainsTask(tasksInOrder, currentTask) {
+ if tfv1beta1.ListContainsTask(tasksInOrder, currentTask) {
for _, task := range tasksInOrder {
if task == currentTask {
isUpNext = true
continue
}
- if isUpNext && tfv1alpha2.ListContainsTask(configuredTasks, task) {
+ if isUpNext && tfv1beta1.ListContainsTask(configuredTasks, task) {
next = task
break
}
}
- } else if tfv1alpha2.ListContainsTask(deleteTasksInOrder, currentTask) {
+ } else if tfv1beta1.ListContainsTask(deleteTasksInOrder, currentTask) {
for _, task := range deleteTasksInOrder {
if task == currentTask {
isUpNext = true
continue
}
- if isUpNext && tfv1alpha2.ListContainsTask(configuredTasks, task) {
+ if isUpNext && tfv1beta1.ListContainsTask(configuredTasks, task) {
next = task
break
}
@@ -1132,7 +1126,7 @@ func nextTask(currentTask tfv1alpha2.TaskName, configuredTasks []tfv1alpha2.Task
return next
}
-func (r ReconcileTerraform) backgroundReapOldGenerationPods(tf *tfv1alpha2.Terraform, attempt int) {
+func (r ReconcileTerraform) backgroundReapOldGenerationPods(tf *tfv1beta1.Terraform, attempt int) {
logger := r.Log.WithName("Reaper").WithValues("Terraform", fmt.Sprintf("%s/%s", tf.Namespace, tf.Name))
if attempt > 20 {
// TODO explain what and way resources cannot be reaped
@@ -1156,11 +1150,11 @@ func (r ReconcileTerraform) backgroundReapOldGenerationPods(tf *tfv1alpha2.Terra
}
// The labels required are read as:
- // 1. The terraforms.tf.isaaguilar.com/generation key MUST exist
- // 2. The terraforms.tf.isaaguilar.com/generation value MUST match the current resource generation
- // 3. The terraforms.tf.isaaguilar.com/resourceName key MUST exist
- // 4. The terraforms.tf.isaaguilar.com/resourceName value MUST match the resource name
- labelSelector, err := labels.Parse(fmt.Sprintf("terraforms.tf.isaaguilar.com/generation,terraforms.tf.isaaguilar.com/generation!=%d,terraforms.tf.isaaguilar.com/resourceName,terraforms.tf.isaaguilar.com/resourceName=%s", tf.Generation, tf.Name))
+ // 1. The terraforms.tf.galleybytes.com/generation key MUST exist
+ // 2. The terraforms.tf.galleybytes.com/generation value MUST match the current resource generation
+ // 3. The terraforms.tf.galleybytes.com/resourceName key MUST exist
+ // 4. The terraforms.tf.galleybytes.com/resourceName value MUST match the resource name
+ labelSelector, err := labels.Parse(fmt.Sprintf("terraforms.tf.galleybytes.com/generation,terraforms.tf.galleybytes.com/generation!=%d,terraforms.tf.galleybytes.com/resourceName,terraforms.tf.galleybytes.com/resourceName=%s", tf.Generation, tf.Name))
if err != nil {
logger.Error(err, "Could not parse labels")
}
@@ -1251,7 +1245,7 @@ func (r ReconcileTerraform) backgroundReapOldGenerationPods(tf *tfv1alpha2.Terra
}
}
-func (r ReconcileTerraform) reapPlugins(tf *tfv1alpha2.Terraform, attempt int) {
+func (r ReconcileTerraform) reapPlugins(tf *tfv1beta1.Terraform, attempt int) {
logger := r.Log.WithName("ReaperPlugins").WithValues("Terraform", fmt.Sprintf("%s/%s", tf.Namespace, tf.Name))
if attempt > 20 {
// TODO explain what and way resources cannot be reaped
@@ -1274,7 +1268,7 @@ func (r ReconcileTerraform) reapPlugins(tf *tfv1alpha2.Terraform, attempt int) {
}
// Delete old plugins regardless of pod phase
- labelSelectorForPlugins, err := labels.Parse(fmt.Sprintf("terraforms.tf.isaaguilar.com/isPlugin=true,terraforms.tf.isaaguilar.com/generation,terraforms.tf.isaaguilar.com/generation!=%d,terraforms.tf.isaaguilar.com/resourceName,terraforms.tf.isaaguilar.com/resourceName=%s", tf.Generation, tf.Name))
+ labelSelectorForPlugins, err := labels.Parse(fmt.Sprintf("terraforms.tf.galleybytes.com/isPlugin=true,terraforms.tf.galleybytes.com/generation,terraforms.tf.galleybytes.com/generation!=%d,terraforms.tf.galleybytes.com/resourceName,terraforms.tf.galleybytes.com/resourceName=%s", tf.Generation, tf.Name))
if err != nil {
logger.Error(err, "Could not parse labels")
}
@@ -1349,7 +1343,7 @@ func (r ReconcileTerraform) getNodeSelectorsFromCache() (*corev1.Affinity, map[s
// createPluginPod will attempt to create the plugin pod and mark it as added in the resource's status.
// No logic is used to determine if the plugin was successful. If the createPod function errors, a log event
// is recorded in the controller.
-func (r ReconcileTerraform) createPluginPod(ctx context.Context, logger logr.Logger, tf *tfv1alpha2.Terraform, pluginTaskName tfv1alpha2.TaskName, pluginConfig tfv1alpha2.Plugin, globalEnvFrom []corev1.EnvFromSource) (reconcile.Result, error) {
+func (r ReconcileTerraform) createPluginPod(ctx context.Context, logger logr.Logger, tf *tfv1beta1.Terraform, pluginTaskName tfv1beta1.TaskName, pluginConfig tfv1beta1.Plugin, globalEnvFrom []corev1.EnvFromSource) (reconcile.Result, error) {
affinity, nodeSelector, tolerations := r.getNodeSelectorsFromCache()
pluginRunOpts := newTaskOptions(tf, pluginTaskName, tf.Generation, globalEnvFrom, affinity, nodeSelector, tolerations)
pluginRunOpts.image = pluginConfig.Image
@@ -1376,10 +1370,10 @@ func (r ReconcileTerraform) createPluginPod(ctx context.Context, logger logr.Log
// the finalizer is added.
//
// The finalizer will be responsible for starting the destroy-workflow.
-func updateFinalizer(tf *tfv1alpha2.Terraform) bool {
+func updateFinalizer(tf *tfv1beta1.Terraform) bool {
finalizers := tf.GetFinalizers()
- if tf.Status.Phase == tfv1alpha2.PhaseDeleted {
+ if tf.Status.Phase == tfv1beta1.PhaseDeleted {
if utils.ListContainsStr(finalizers, terraformFinalizer) {
tf.SetFinalizers(utils.ListRemoveStr(finalizers, terraformFinalizer))
return true
@@ -1402,7 +1396,7 @@ func updateFinalizer(tf *tfv1alpha2.Terraform) bool {
return false
}
-func (r ReconcileTerraform) update(ctx context.Context, tf *tfv1alpha2.Terraform) error {
+func (r ReconcileTerraform) update(ctx context.Context, tf *tfv1beta1.Terraform) error {
err := r.Client.Update(ctx, tf)
if err != nil {
return fmt.Errorf("failed to update tf resource: %s", err)
@@ -1410,7 +1404,7 @@ func (r ReconcileTerraform) update(ctx context.Context, tf *tfv1alpha2.Terraform
return nil
}
-func (r ReconcileTerraform) updateStatus(ctx context.Context, tf *tfv1alpha2.Terraform) error {
+func (r ReconcileTerraform) updateStatus(ctx context.Context, tf *tfv1beta1.Terraform) error {
err := r.Client.Status().Update(ctx, tf)
if err != nil {
return fmt.Errorf("failed to update tf status: %s", err)
@@ -1418,7 +1412,7 @@ func (r ReconcileTerraform) updateStatus(ctx context.Context, tf *tfv1alpha2.Ter
return nil
}
-func (r ReconcileTerraform) updateStatusWithRetry(ctx context.Context, tf *tfv1alpha2.Terraform, desiredStatus *tfv1alpha2.TerraformStatus, logger logr.Logger) error {
+func (r ReconcileTerraform) updateStatusWithRetry(ctx context.Context, tf *tfv1beta1.Terraform, desiredStatus *tfv1beta1.TerraformStatus, logger logr.Logger) error {
resourceNamespacedName := types.NamespacedName{Namespace: tf.Namespace, Name: tf.Name}
var getResourceErr error
var updateErr error
@@ -1449,7 +1443,7 @@ func (r ReconcileTerraform) updateStatusWithRetry(ctx context.Context, tf *tfv1a
return fmt.Errorf("failed to get latest terraform while validating status: %s", updatedResourceErr)
}
- if !tfv1alpha2.TaskListsAreEqual(tf.Status.Plugins, desiredStatus.Plugins) {
+ if !tfv1beta1.TaskListsAreEqual(tf.Status.Plugins, desiredStatus.Plugins) {
logger.V(7).Info(fmt.Sprintf("Failed to confirm the status update because plugins did not equal. Have %s and Want %s", tf.Status.Plugins, desiredStatus.Plugins))
} else if stageItem := tf.Status.Stage.IsEqual(desiredStatus.Stage); stageItem != "" {
@@ -1493,7 +1487,7 @@ func IsJobFinished(job *batchv1.Job) bool {
return job.Status.CompletionTime != nil || (job.Status.Active == 0 && BackoffLimit != nil && job.Status.Failed >= *BackoffLimit)
}
-func formatJobSSHConfig(ctx context.Context, reqLogger logr.Logger, tf *tfv1alpha2.Terraform, k8sclient client.Client) (map[string][]byte, error) {
+func formatJobSSHConfig(ctx context.Context, reqLogger logr.Logger, tf *tfv1beta1.Terraform, k8sclient client.Client) (map[string][]byte, error) {
data := make(map[string]string)
dataAsByte := make(map[string][]byte)
if tf.Spec.SSHTunnel != nil {
@@ -1569,7 +1563,7 @@ func formatJobSSHConfig(ctx context.Context, reqLogger logr.Logger, tf *tfv1alph
return dataAsByte, nil
}
-func (r *ReconcileTerraform) setupAndRun(ctx context.Context, tf *tfv1alpha2.Terraform, runOpts TaskOptions) error {
+func (r *ReconcileTerraform) setupAndRun(ctx context.Context, tf *tfv1beta1.Terraform, runOpts TaskOptions) error {
reqLogger := r.Log.WithValues("Terraform", types.NamespacedName{Name: tf.Name, Namespace: tf.Namespace}.String())
var err error
@@ -1688,64 +1682,6 @@ func (r *ReconcileTerraform) setupAndRun(ctx context.Context, tf *tfv1alpha2.Ter
// Override the backend.tf by inserting a custom backend
runOpts.mainModulePluginData["backend_override.tf"] = tf.Spec.Backend
-
- /*
-
-
- All the tasks will perform external fetching of the scripts to
- execute. The downloader has yet to be determined... working on it
-
- :)
-
-
- */
- // if tf.Spec.PreInitScript != "" {
- // runOpts.mainModuleAddonData[string(tfv1alpha1.PodPreInit)] = tf.Spec.PreInitScript
- // }
-
- // if tf.Spec.PostInitScript != "" {
- // runOpts.mainModuleAddonData[string(tfv1alpha1.PodPostInit)] = tf.Spec.PostInitScript
- // }
-
- // if tf.Spec.PrePlanScript != "" {
- // runOpts.mainModuleAddonData[string(tfv1alpha1.PodPrePlan)] = tf.Spec.PrePlanScript
- // }
-
- // if tf.Spec.PostPlanScript != "" {
- // runOpts.mainModuleAddonData[string(tfv1alpha1.PodPostPlan)] = tf.Spec.PostPlanScript
- // }
-
- // if tf.Spec.PreApplyScript != "" {
- // runOpts.mainModuleAddonData[string(tfv1alpha1.PodPreApply)] = tf.Spec.PreApplyScript
- // }
-
- // if tf.Spec.PostApplyScript != "" {
- // runOpts.mainModuleAddonData[string(tfv1alpha1.PodPostApply)] = tf.Spec.PostApplyScript
- // }
-
- // if tf.Spec.PreInitDeleteScript != "" {
- // runOpts.mainModuleAddonData[string(tfv1alpha1.PodPreInitDelete)] = tf.Spec.PreInitDeleteScript
- // }
-
- // if tf.Spec.PostInitDeleteScript != "" {
- // runOpts.mainModuleAddonData[string(tfv1alpha1.PodPostInitDelete)] = tf.Spec.PostInitDeleteScript
- // }
-
- // if tf.Spec.PrePlanDeleteScript != "" {
- // runOpts.mainModuleAddonData[string(tfv1alpha1.PodPrePlanDelete)] = tf.Spec.PrePlanDeleteScript
- // }
-
- // if tf.Spec.PostPlanDeleteScript != "" {
- // runOpts.mainModuleAddonData[string(tfv1alpha1.PodPostPlanDelete)] = tf.Spec.PostPlanDeleteScript
- // }
-
- // if tf.Spec.PreApplyDeleteScript != "" {
- // runOpts.mainModuleAddonData[string(tfv1alpha1.PodPreApplyDelete)] = tf.Spec.PostApplyScript
- // }
-
- // if tf.Spec.PostApplyDeleteScript != "" {
- // runOpts.mainModuleAddonData[string(tfv1alpha1.PodPostApplyDelete)] = tf.Spec.PostApplyDeleteScript
- // }
}
// RUN
@@ -1769,7 +1705,7 @@ func (r ReconcileTerraform) checkPersistentVolumeClaimExists(ctx context.Context
return resource, true, nil
}
-func (r ReconcileTerraform) createPVC(ctx context.Context, tf *tfv1alpha2.Terraform, runOpts TaskOptions) error {
+func (r ReconcileTerraform) createPVC(ctx context.Context, tf *tfv1beta1.Terraform, runOpts TaskOptions) error {
kind := "PersistentVolumeClaim"
_, found, err := r.checkPersistentVolumeClaimExists(ctx, types.NamespacedName{
Name: runOpts.prefixedName,
@@ -1826,7 +1762,7 @@ func (r ReconcileTerraform) deleteConfigMapIfExists(ctx context.Context, name, n
return nil
}
-func (r ReconcileTerraform) createConfigMap(ctx context.Context, tf *tfv1alpha2.Terraform, runOpts TaskOptions) error {
+func (r ReconcileTerraform) createConfigMap(ctx context.Context, tf *tfv1beta1.Terraform, runOpts TaskOptions) error {
kind := "ConfigMap"
resource := runOpts.generateConfigMap()
@@ -1875,7 +1811,7 @@ func (r ReconcileTerraform) deleteSecretIfExists(ctx context.Context, name, name
return nil
}
-func (r ReconcileTerraform) createSecret(ctx context.Context, tf *tfv1alpha2.Terraform, name, namespace string, data map[string][]byte, recreate bool, labelsToOmit []string, runOpts TaskOptions) error {
+func (r ReconcileTerraform) createSecret(ctx context.Context, tf *tfv1beta1.Terraform, name, namespace string, data map[string][]byte, recreate bool, labelsToOmit []string, runOpts TaskOptions) error {
kind := "Secret"
// Must make a clean map of labels since the memory address is shared
@@ -1943,7 +1879,7 @@ func (r ReconcileTerraform) deleteServiceAccountIfExists(ctx context.Context, na
return nil
}
-func (r ReconcileTerraform) createServiceAccount(ctx context.Context, tf *tfv1alpha2.Terraform, runOpts TaskOptions) error {
+func (r ReconcileTerraform) createServiceAccount(ctx context.Context, tf *tfv1beta1.Terraform, runOpts TaskOptions) error {
kind := "ServiceAccount"
resource := runOpts.generateServiceAccount()
@@ -1991,7 +1927,7 @@ func (r ReconcileTerraform) deleteRoleIfExists(ctx context.Context, name, namesp
return nil
}
-func (r ReconcileTerraform) createRole(ctx context.Context, tf *tfv1alpha2.Terraform, runOpts TaskOptions) error {
+func (r ReconcileTerraform) createRole(ctx context.Context, tf *tfv1beta1.Terraform, runOpts TaskOptions) error {
kind := "Role"
resource := runOpts.generateRole()
@@ -2039,7 +1975,7 @@ func (r ReconcileTerraform) deleteRoleBindingIfExists(ctx context.Context, name,
return nil
}
-func (r ReconcileTerraform) createRoleBinding(ctx context.Context, tf *tfv1alpha2.Terraform, runOpts TaskOptions) error {
+func (r ReconcileTerraform) createRoleBinding(ctx context.Context, tf *tfv1beta1.Terraform, runOpts TaskOptions) error {
kind := "RoleBinding"
resource := runOpts.generateRoleBinding()
@@ -2058,7 +1994,7 @@ func (r ReconcileTerraform) createRoleBinding(ctx context.Context, tf *tfv1alpha
return nil
}
-func (r ReconcileTerraform) createPod(ctx context.Context, tf *tfv1alpha2.Terraform, runOpts TaskOptions) error {
+func (r ReconcileTerraform) createPod(ctx context.Context, tf *tfv1beta1.Terraform, runOpts TaskOptions) error {
kind := "Pod"
resource := runOpts.generatePod()
@@ -2077,7 +2013,7 @@ func int32p(i int32) *int32 {
return &i
}
-func (r ReconcileTerraform) createJob(ctx context.Context, tf *tfv1alpha2.Terraform, runOpts TaskOptions) error {
+func (r ReconcileTerraform) createJob(ctx context.Context, tf *tfv1beta1.Terraform, runOpts TaskOptions) error {
kind := "Job"
resource := runOpts.generateJob()
@@ -2166,7 +2102,7 @@ func (r TaskOptions) generateRole() *rbacv1.Role {
},
{
Verbs: []string{"get"},
- APIGroups: []string{"tf.isaaguilar.com"},
+ APIGroups: []string{"tf.galleybytes.com"},
Resources: []string{"terraforms"},
ResourceNames: []string{r.resourceName},
},
@@ -2568,7 +2504,7 @@ func (r TaskOptions) generatePod() *corev1.Pod {
}
for _, c := range r.credentials {
- if (tfv1alpha2.SecretNameRef{}) != c.SecretNameRef {
+ if (tfv1beta1.SecretNameRef{}) != c.SecretNameRef {
envFrom = append(envFrom, []corev1.EnvFromSource{
{
SecretRef: &corev1.SecretEnvSource{
@@ -2636,7 +2572,7 @@ func (r TaskOptions) generatePod() *corev1.Pod {
return pod
}
-func (r ReconcileTerraform) run(ctx context.Context, reqLogger logr.Logger, tf *tfv1alpha2.Terraform, runOpts TaskOptions, isNewGeneration, isFirstInstall bool) (err error) {
+func (r ReconcileTerraform) run(ctx context.Context, reqLogger logr.Logger, tf *tfv1beta1.Terraform, runOpts TaskOptions, isNewGeneration, isFirstInstall bool) (err error) {
if isFirstInstall || isNewGeneration {
if err := r.createEnvFromSources(ctx, tf); err != nil {
@@ -2672,7 +2608,7 @@ func (r ReconcileTerraform) run(ctx context.Context, reqLogger logr.Logger, tf *
labelsToOmit := []string{}
if runOpts.stripGenerationLabelOnOutputsSecret {
- labelsToOmit = append(labelsToOmit, "terraforms.tf.isaaguilar.com/generation")
+ labelsToOmit = append(labelsToOmit, "terraforms.tf.galleybytes.com/generation")
}
if err := r.createSecret(ctx, tf, runOpts.outputsSecretName, runOpts.namespace, map[string][]byte{}, false, labelsToOmit, runOpts); err != nil {
return err
@@ -2739,7 +2675,7 @@ func (r ReconcileTerraform) run(ctx context.Context, reqLogger logr.Logger, tf *
return nil
}
-func (r ReconcileTerraform) createGitAskpass(ctx context.Context, tokenSecret tfv1alpha2.TokenSecretRef) ([]byte, error) {
+func (r ReconcileTerraform) createGitAskpass(ctx context.Context, tokenSecret tfv1beta1.TokenSecretRef) ([]byte, error) {
secret, err := r.loadSecret(ctx, tokenSecret.Name, tokenSecret.Namespace)
if err != nil {
return []byte{}, err
diff --git a/pkg/controllers/terraform_controller_test.go b/pkg/controllers/terraform_controller_test.go
deleted file mode 100644
index 4a1586203e6c4462bc8fdeeac1582d4fd1915f28..0000000000000000000000000000000000000000
--- a/pkg/controllers/terraform_controller_test.go
+++ /dev/null
@@ -1,270 +0,0 @@
-/*
-Copyright isaaguilar.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package controllers
-
-import (
- "context"
- "encoding/json"
- "fmt"
- "testing"
- "time"
-
- tfv1alpha1 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1"
- . "github.com/onsi/ginkgo"
- . "github.com/onsi/gomega"
- batchv1 "k8s.io/api/batch/v1"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/apimachinery/pkg/types"
-)
-
-var _ = Describe("Terraform controller", func() {
-
- // Define utility constants for object names and testing timeouts/durations and intervals.
- const (
- TerraformName = "test-tfo"
- TerraformNamespace = "default"
- JobName = "test-tfo"
- ServiceAccountName = "tf-test-tfo"
- Image = "isaaguilar/tfops:0.13.5"
- ImagePullPolicy = "Always"
-
- timeout = time.Second * 10
- duration = time.Second * 10
- interval = time.Millisecond * 250
- )
-
- Context("When Creating Terraform", func() {
- It("Should update Terraform phase when jobs create pods", func() {
- By("By creating a new Terraform")
- ctx := context.Background()
-
- terraform := tfv1alpha1.Terraform{
- ObjectMeta: metav1.ObjectMeta{
- Name: TerraformName,
- Namespace: TerraformNamespace,
- },
- Spec: tfv1alpha1.TerraformSpec{
- TerraformModule: "https://github.com/cloudposse/terraform-example-module.git?ref=master",
- },
- }
- Expect(k8sClient.Create(ctx, &terraform)).Should(Succeed())
-
- terraformLookupKey := types.NamespacedName{Name: TerraformName, Namespace: TerraformNamespace}
- createdTerraform := &tfv1alpha1.Terraform{}
-
- Eventually(func() bool {
- err := k8sClient.Get(ctx, terraformLookupKey, createdTerraform)
- return err == nil
- }, timeout, interval).Should(BeTrue())
- Expect(createdTerraform.Status.Phase).Should(Equal(""))
-
- job := batchv1.Job{}
- Eventually(func() bool {
- err := k8sClient.Get(ctx, terraformLookupKey, &job)
- return err == nil
-
- }, timeout, interval).Should(BeTrue())
-
- By("By checking that the Terraform phase updates when job has active pods")
-
- job.Status.Active = int32(1)
- Expect(k8sClient.Status().Update(ctx, &job)).Should(Succeed())
-
- Eventually(func() (string, error) {
- err := k8sClient.Get(ctx, terraformLookupKey, createdTerraform)
- if err != nil {
- return "", err
- }
-
- return string(createdTerraform.Status.Phase), nil
- }, timeout, interval).Should(Equal("running"))
-
- By("By checking that the Terraform phase updates when job changes to succeeded")
-
- job.Status.Active = int32(0)
- job.Status.Succeeded = int32(1)
- Expect(k8sClient.Status().Update(ctx, &job)).Should(Succeed())
-
- Eventually(func() (string, error) {
- err := k8sClient.Get(ctx, terraformLookupKey, createdTerraform)
- if err != nil {
- return "", err
- }
-
- return string(createdTerraform.Status.Phase), nil
- }, timeout, interval).Should(Equal("stopped"))
-
- })
- })
-})
-
-func TestGetParsedAddress(t *testing.T) {
- var err error
- // p, err = getParsedAddress("foo::git::http://foobar.com//boo/bar//bash?ref=a12994d&url=example.com/chke/diil")
- // if err != nil {
- // t.Error(err)
- // }
- // p, err = getParsedAddress("git::ssh://git@github.com/user/repo//foo/bar/file?ref=12345632&sdf=http://go.com/ok")
- // if err != nil {
- // t.Error(err)
- // }
- // p, err = getParsedAddress("http://foobar.com//boo/bar//bash?ref=a12994d&url=example.com/chke/diil")
- // if err != nil {
- // t.Error(err)
- // }
- // p, err = getParsedAddress("github.com/user/repo.git//boo/bar//bash")
- // if err != nil {
- // t.Error(err)
- // }
- // p, err = getParsedAddress("http://user:password@github.com/user/repo.git//boo/bar//bash")
- // if err != nil {
- // t.Error(err)
- // }
- // p, err = getParsedAddress("s3://tf.isaaguilar.com/index//bash?ref=a12994d&url=example.com/chke/diil")
- // if err != nil {
- // t.Error(err)
- // }
- // p, err = getParsedAddress("git@github.com:user/repo//my/favorite/file.txt?ref=12345632")
- // if err != nil {
- // t.Error(err)
- // }
- // p, err = getParsedAddress("path/to/my/local.txt")
- // if err != nil {
- // t.Error(err)
- // }
- // p, err = getParsedAddress("/my/abs/path.out")
- // if err != nil {
- // t.Error(err)
- // }
- // p, err = getParsedAddress("../../up/a/directory.tf")
- // if err != nil {
- // t.Error(err)
- // }
- // p, err = getParsedAddress("fee/fie/foe?ref=0.1.0")
- // if err != nil {
- // t.Error(err)
- // }
- // p, err = getParsedAddress("example.com/awesomecorp/consul/happycloud")
- // if err != nil {
- // t.Error(err)
- // }
- // p, err = getParsedAddress("github.com/isaaguilar/terraform-aws-multi-account-peering")
- // if err != nil {
- // t.Error(err)
- // }
- // scmdetecotor := scmDetector{hosts: []string{"github.com"}}
- var b []byte
- var p ParsedAddress
- var exampleScmType scmType = "bar"
-
- scmMap := map[string]scmType{
- "github.com": gitScmType,
- "foo.io": exampleScmType,
- }
- p, err = getParsedAddress("github.com/hashicorp/example", "", false, scmMap)
- if err != nil {
- t.Error(err)
- }
- b, _ = json.MarshalIndent(p, "", " ")
- fmt.Println(string(b))
-
- p, err = getParsedAddress("git@github.com:hashicorp/example.git", "", false, scmMap)
- if err != nil {
- t.Error(err)
- }
- b, _ = json.MarshalIndent(p, "", " ")
- fmt.Println(string(b))
-
- p, err = getParsedAddress("https://github.com/hashicorp/example//path/to/a//abs/to/b//root/c?do=this&url=https://google.com/ohno/ok&ref=master", "", false, scmMap)
- if err != nil {
- t.Error(err)
- }
- b, _ = json.MarshalIndent(p, "", " ")
- fmt.Println(string(b))
-
- p, err = getParsedAddress("git::https://example.com/vpc.git", "", false, scmMap)
- if err != nil {
- t.Error(err)
- }
- b, _ = json.MarshalIndent(p, "", " ")
- fmt.Println(string(b))
-
- p, err = getParsedAddress("git::ssh://username@example.com/storage.git", "", false, scmMap)
- if err != nil {
- t.Error(err)
- }
- b, _ = json.MarshalIndent(p, "", " ")
- fmt.Println(string(b))
-
- p, err = getParsedAddress("git::username@example.com:storage.git", "", false, scmMap)
- if err != nil {
- t.Error(err)
- }
- b, _ = json.MarshalIndent(p, "", " ")
- fmt.Println(string(b))
-
- p, err = getParsedAddress("hg::http://example.com/vpc.hg", "", false, scmMap)
- if err != nil {
- t.Error(err)
- }
- b, _ = json.MarshalIndent(p, "", " ")
- fmt.Println(string(b))
-
- p, err = getParsedAddress("https://example.com/vpc-module.zip", "", false, scmMap)
- if err != nil {
- t.Error(err)
- }
- b, _ = json.MarshalIndent(p, "", " ")
- fmt.Println(string(b))
-
- p, err = getParsedAddress("s3::https://s3-eu-west-1.amazonaws.com/examplecorp-terraform-modules/vpc.zip", "", false, scmMap)
- if err != nil {
- t.Error(err)
- }
- b, _ = json.MarshalIndent(p, "", " ")
- fmt.Println(string(b))
-
- p, err = getParsedAddress("gcs::https://www.googleapis.com/storage/v1/modules/foomodule.zip", "", false, scmMap)
- if err != nil {
- t.Error(err)
- }
- b, _ = json.MarshalIndent(p, "", " ")
- fmt.Println(string(b))
-
- p, err = getParsedAddress("ssh://username@example.com/storage.git", "", false, scmMap)
- if err != nil {
- t.Error(err)
- }
- b, _ = json.MarshalIndent(p, "", " ")
- fmt.Println(string(b))
-
- p, err = getParsedAddress("username@example.com:storage.git", "", false, scmMap)
- if err != nil {
- t.Error(err)
- }
- b, _ = json.MarshalIndent(p, "", " ")
- fmt.Println(string(b))
-
- p, err = getParsedAddress("username@foo.io:myfavoriteuser/myfavoriterepo.goo?ref=7654321", "", false, scmMap)
- if err != nil {
- t.Error(err)
- }
- b, _ = json.MarshalIndent(p, "", " ")
- fmt.Println(string(b))
-
- // fmt.Printf("%+v", parsed)
-}
diff --git a/pkg/gitclient/client.go b/pkg/gitclient/client.go
deleted file mode 100644
index f2b1d5e88a4e59483823070d436c497d4f4c9d7d..0000000000000000000000000000000000000000
--- a/pkg/gitclient/client.go
+++ /dev/null
@@ -1,426 +0,0 @@
-package gitclient
-
-import (
- "fmt"
- "io/ioutil"
- "log"
- "os"
- "strconv"
- "sync"
- "time"
-
- "github.com/go-logr/logr"
-
- "github.com/isaaguilar/terraform-operator/pkg/utils"
-
- "golang.org/x/crypto/ssh"
- git "gopkg.in/src-d/go-git.v4"
- "gopkg.in/src-d/go-git.v4/config"
- "gopkg.in/src-d/go-git.v4/plumbing"
- "gopkg.in/src-d/go-git.v4/plumbing/object"
- gitauth "gopkg.in/src-d/go-git.v4/plumbing/transport"
- githttp "gopkg.in/src-d/go-git.v4/plumbing/transport/http"
- gitssh "gopkg.in/src-d/go-git.v4/plumbing/transport/ssh"
-)
-
-type GitRepo struct {
- auth gitauth.AuthMethod
- url string
- repo *git.Repository
- ref *plumbing.Reference
- Log logr.Logger
-}
-
-func NewGitRepo(user, password, sshKeyFilename string, logger logr.Logger) (GitRepo, error) {
- var auth gitauth.AuthMethod
- var err error
- if password != "" {
- auth = passwordAuthMethod(user, password)
- }
- if sshKeyFilename != "" {
- auth, err = sshAuthMethod(sshKeyFilename)
- if err != nil {
- return GitRepo{}, err
- }
- }
-
- return GitRepo{
- auth: auth,
- Log: logger,
- }, nil
-}
-
-func (g *GitRepo) HashString() (string, error) {
- if g.ref == nil {
- return "", fmt.Errorf("the GitRepo.ref has not been set")
- }
- return g.ref.Hash().String(), nil
-
-}
-
-func (g GitRepo) BranchName() (string, error) {
- if g.ref == nil {
- return "", fmt.Errorf("the GitRepo.ref has not been set")
- }
- if !g.ref.Name().IsBranch() {
- return "", fmt.Errorf("repo HEAD is not pointing to a branch")
- }
- return g.ref.Name().String(), nil
-}
-
-func (g *GitRepo) checkout(commit string) error {
- reqLogger := g.Log.WithValues("repo", g.url)
- w, err := g.repo.Worktree()
- if err != nil {
- return fmt.Errorf("could not get Worktree: %v", err)
- }
-
- // Check if this is a hash
- n, _ := strconv.ParseUint(commit, 16, 64)
- if len(commit) == 40 && n > 0 {
- reqLogger.V(1).Info(fmt.Sprintf("Checking out hash: '%v'", commit))
- // Try checking out a hash commit
- err = w.Checkout(&git.CheckoutOptions{
- Hash: plumbing.NewHash(commit),
- })
- if err != nil {
- return fmt.Errorf("error checking out hash: %v", err)
- }
- } else {
- reqLogger.V(1).Info(fmt.Sprintf("Checking out branch: '%v'", "refs/heads/"+commit))
- // Try checking out a branch
- err = w.Checkout(&git.CheckoutOptions{
- Branch: plumbing.ReferenceName("refs/heads/" + commit),
- })
- if err != nil {
- return fmt.Errorf("error checking out branch: %v", err)
- }
- }
- ref, err := g.repo.Head()
- if err != nil {
- return fmt.Errorf("error reading head: %v", err)
- }
- g.ref = ref
- return nil
-}
-
-func (g *GitRepo) downloadGitRepo(c chan error, wg *sync.WaitGroup, url, repoDir string) {
- reqLogger := g.Log.WithValues("repo", g.url)
- // Setup a logger that writes entries from an io.Writer
- progressLogger := log2logr{
- entry: g.Log.WithValues("repo", g.url),
- }
-
- defer wg.Done()
- defer close(c)
- gitConfigs := git.CloneOptions{
- URL: url,
- RecurseSubmodules: git.DefaultSubmoduleRecursionDepth,
- ReferenceName: "refs/heads/master",
- Progress: progressLogger,
- }
-
- if g.auth != nil {
- gitConfigs.Auth = g.auth
- }
-
- err := gitConfigs.Validate()
- if err != nil {
- c <- fmt.Errorf("git config not valid: %v", err)
- return
- }
-
- reqLogger.V(1).Info("Cloning repo")
- r, err := git.PlainClone(repoDir, false, &gitConfigs)
- if err != nil {
- c <- fmt.Errorf("could not checkout repo: %v", err)
- return
- }
- g.repo = r
-
-}
-
-func (g *GitRepo) fetchRefs() error {
- reqLogger := g.Log.WithValues("repo", g.url)
- // Setup a logger that writes entries from an io.Writer
- progressLogger := log2logr{
- entry: g.Log.WithValues("repo", g.url),
- }
- // Checkout the git-refs used for checkouts
- reqLogger.V(1).Info("Fetching refs")
- err := g.repo.Fetch(&git.FetchOptions{
- Auth: g.auth,
- RefSpecs: []config.RefSpec{"refs/*:refs/*", "HEAD:refs/heads/HEAD"},
- Progress: progressLogger,
- })
- if err != nil {
- return fmt.Errorf("could not Fetch: %v", err)
- }
-
- ref, err := g.repo.Head()
- if err != nil {
- return fmt.Errorf("error reading head: %v", err)
- }
- g.ref = ref
- return nil
-}
-
-func passwordAuthMethod(user, password string) gitauth.AuthMethod {
- auth := &githttp.BasicAuth{
- Username: user,
- Password: password,
- }
- return auth
-}
-
-func sshAuthMethod(sshKeyFilename string) (gitauth.AuthMethod, error) {
- var auth gitauth.AuthMethod
-
- sshKey, err := os.Open(sshKeyFilename)
- if err != nil {
- return auth, err
- }
-
- defer sshKey.Close()
-
- keyF, err := ioutil.ReadFile(sshKey.Name())
- if err != nil {
- return auth, err
- }
-
- // Create the Signer for this private key.
- signer, err := ssh.ParsePrivateKey(keyF)
- if err != nil {
- return auth, err
- }
-
- auth = &gitssh.PublicKeys{
- User: "git",
- Signer: signer,
- HostKeyCallbackHelper: gitssh.HostKeyCallbackHelper{
- HostKeyCallback: ssh.InsecureIgnoreHostKey(),
- },
- }
-
- if auth.Name() == "" {
- return auth, fmt.Errorf("unable to get gitauth Method")
- }
-
- return auth, nil
-}
-
-func (g *GitRepo) GitHTTPDownload(url, repoDir, user, password, ref string, timeout int64) error {
- g.url = url
- reqLogger := g.Log.WithValues("repo", url)
- reqLogger.V(1).Info("Configuring git download")
- if g.auth != nil {
- reqLogger.V(1).Info(fmt.Sprintf("Auth file set as '%s'", g.auth.Name()))
- }
- if timeout == 0 {
- timeout = int64(120)
- }
- c := make(chan error)
- var wg sync.WaitGroup
- wg.Add(1)
- go g.downloadGitRepo(c, &wg, url, repoDir)
- select {
- case err := <-c:
- if err != nil {
- return fmt.Errorf("could not download repo: %v", err)
- }
- case <-time.After(time.Duration(timeout) * time.Second):
- return fmt.Errorf("timeout occured fetching %s", url)
- }
- wg.Wait()
- reqLogger.V(1).Info("Successfully downloaded repo")
-
- err := g.fetchRefs()
- if err != nil {
- return err
- }
- reqLogger.V(1).Info("Successfully fetched refs")
-
- if ref != "" {
- g.checkout(ref)
- }
- return nil
-}
-
-func (g *GitRepo) GitSSHDownload(url, repoDir, sshKeyFilename, ref string, timeout int64) error {
- g.url = url
- reqLogger := g.Log.WithValues("repo", url)
- reqLogger.V(1).Info("Configuring git download")
- reqLogger.V(1).Info(fmt.Sprintf("Auth file set as '%s'", g.auth.Name()))
- if timeout == 0 {
- timeout = int64(120)
- }
- c := make(chan error)
- var wg sync.WaitGroup
- wg.Add(1)
- go g.downloadGitRepo(c, &wg, url, repoDir)
- select {
- case err := <-c:
- if err != nil {
- return fmt.Errorf("could not download repo: %v", err)
- }
- case <-time.After(time.Duration(timeout) * time.Second):
- return fmt.Errorf("timeout occured fetching %s", url)
- }
- wg.Wait()
- reqLogger.V(1).Info("Successfully downloaded repo")
-
- err := g.fetchRefs()
- if err != nil {
- return err
- }
- reqLogger.V(1).Info("Successfully fetched refs")
-
- if ref != "" {
- g.checkout(ref)
- reqLogger.V(1).Info(fmt.Sprintf("Checked out '%s' for '%s'", ref, url))
- }
- return nil
-}
-
-// func printRef(s *plumbing.Reference) error {
-// fmt.Printf("reference: %+v\n", s)
-// return nil
-// }
-
-// func GetData(filename string) (map[string]interface{}, error) {
-// d := make(map[string]interface{})
-// return d, nil
-// }
-
-func (g *GitRepo) CheckoutBranch(branch string) error {
- var b plumbing.ReferenceName
- if branch != "" {
- b = plumbing.ReferenceName(branch)
- } else {
- b = plumbing.ReferenceName("refs/heads/" + utils.RandomString(10))
- }
-
- ref := plumbing.NewHashReference(b, g.ref.Hash())
- err := g.repo.Storer.SetReference(ref)
- if err != nil {
- log.Fatal(err)
- }
-
- w, err := g.repo.Worktree()
- if err != nil {
- return fmt.Errorf("could not get Worktree: %v", err)
- }
-
- err = w.Checkout(&git.CheckoutOptions{
- Branch: b,
- })
- if err != nil {
- return fmt.Errorf("error checking out branch: %v", err)
- }
-
- ref, err = g.repo.Head()
- if err != nil {
- return fmt.Errorf("error reading head: %v", err)
- }
- g.ref = ref
- return nil
-}
-
-func (g *GitRepo) Commit(filenames []string, message string) error {
- reqLogger := g.Log.WithValues("repo", g.url)
- w, err := g.repo.Worktree()
- if err != nil {
- return fmt.Errorf("could not get Worktree: %v", err)
- }
-
- status, err := w.Status()
- if err != nil {
- return err
- }
-
- if status.IsClean() {
- return fmt.Errorf("no changes to commit")
- }
-
- filesInStatus := []string{}
- for file := range status {
- // fmt.Println("file in status", file)
- filesInStatus = append(filesInStatus, file)
- }
-
- isFileInStatus := false
- for _, fileToCommit := range filenames {
- // fmt.Println("file to commit", fileToCommit)
- if utils.ListContainsStr(filesInStatus, fileToCommit) {
- isFileInStatus = true
- break
- }
- }
-
- if !isFileInStatus {
- return fmt.Errorf("no changes to commit")
- }
-
- for _, f := range filenames {
- reqLogger.V(1).Info(fmt.Sprintf("Adding file %v", f))
- _, err := w.Add(f)
- if err != nil {
- return fmt.Errorf("error adding file: %v", err)
- }
- }
-
- commit, err := w.Commit(message, &git.CommitOptions{
- Author: &object.Signature{
- Name: "devops-automation",
- Email: "devops-automation@example.com",
- When: time.Now(),
- },
- })
- if err != nil {
- return err
- }
-
- reqLogger.V(1).Info(fmt.Sprintf("This is the commit object: %v", commit))
-
- ref, err := g.repo.Head()
- if err != nil {
- return fmt.Errorf("error reading head: %v", err)
- }
- g.ref = ref
-
- return nil
-}
-
-func (g *GitRepo) Push(target plumbing.ReferenceName) error {
- // Setup a logger that writes entries from an io.Writer
- progressLogger := log2logr{
- entry: g.Log.WithValues("repo", g.url),
- }
- reqLogger := g.Log.WithValues("repo", g.url)
- if target == "" {
- target = g.ref.Name()
- }
- reqLogger.V(1).Info(fmt.Sprintf("Pushing '%v' to repo", target))
- err := g.repo.Push(&git.PushOptions{
- RefSpecs: []config.RefSpec{config.RefSpec(g.ref.Name() + ":" + target)},
- Auth: g.auth,
- Progress: progressLogger,
- })
- if err != nil {
- return fmt.Errorf("error pushing branch: %v", err)
- }
- return nil
-}
-
-// log2logr exploits the documented fact that the standard
-// log pkg sends each log entry as a single io.Writer.Write call:
-// https://golang.org/pkg/log/#Logger
-type log2logr struct {
- entry logr.Logger
-}
-
-func (w log2logr) Write(b []byte) (int, error) {
- n := len(b)
- w.entry.V(2).Info(string(b))
- return n, nil
-}
diff --git a/pkg/webhook/admission/conversion.go b/pkg/webhook/admission/conversion.go
deleted file mode 100644
index a448c015c5110388f85411a7b6f0567fdefb3b82..0000000000000000000000000000000000000000
--- a/pkg/webhook/admission/conversion.go
+++ /dev/null
@@ -1,131 +0,0 @@
-package admission
-
-import (
- "encoding/json"
- "fmt"
- "log"
- "net/http"
- "strings"
-
- "github.com/go-logr/logr"
- "github.com/isaaguilar/terraform-operator/pkg/webhook/admission/convert"
- apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- unstructuredv1 "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
- "k8s.io/apimachinery/pkg/runtime"
- "k8s.io/apimachinery/pkg/types"
-)
-
-type ConversionWebhook struct {
- log logr.Logger
-}
-
-func NewConversionWebhook(log logr.Logger) ConversionWebhook {
- return ConversionWebhook{log: log}
-}
-
-func (c ConversionWebhook) ServeHTTP(w http.ResponseWriter, r *http.Request) {
- logger := c.log
- convertReview := &apiextensionsv1.ConversionReview{}
- err := json.NewDecoder(r.Body).Decode(convertReview)
- if err != nil {
- logger.Error(err, "failed to read conversion request")
- w.WriteHeader(http.StatusBadRequest)
- return
- }
-
- response, status := c.converter(convertReview.Request)
- convertReview.Response = response
- w.WriteHeader(status)
- if status == 200 {
- log.Printf("Successfully converted resource(s): %s", objectNames(convertReview))
- } else {
- log.Printf("Failed to convert resource(s) %s: %s", objectNames(convertReview), response.Result.Status)
- }
- b, _ := json.Marshal(convertReview)
- w.Write(b)
-}
-
-func objectNames(review *apiextensionsv1.ConversionReview) string {
- names := []string{}
- for _, obj := range review.Response.ConvertedObjects {
- unstructured := unstructuredv1.Unstructured{}
- err := json.Unmarshal(obj.Raw, &unstructured)
- if err == nil {
- names = append(names, unstructured.GetName())
- }
- }
- return strings.Join(names, ",")
-}
-
-// helper to construct error response.
-func errored(uid types.UID, err error) (*apiextensionsv1.ConversionResponse, int) {
- return &apiextensionsv1.ConversionResponse{
- UID: uid,
- Result: metav1.Status{
- Status: metav1.StatusFailure,
- Message: err.Error(),
- },
- }, http.StatusBadRequest
-}
-
-// Takes a conversionRequest and always returns a conversionResponse.
-func (c ConversionWebhook) converter(request *apiextensionsv1.ConversionRequest) (*apiextensionsv1.ConversionResponse, int) {
- desiredAPIVersion := request.DesiredAPIVersion
- if desiredAPIVersion == "" {
- return errored(request.UID, fmt.Errorf("conversion request did not have a desired api version"))
- }
- responseObjects := make([]runtime.RawExtension, len(request.Objects))
- for i, obj := range request.Objects {
- unstructured := unstructuredv1.Unstructured{}
- err := json.Unmarshal(obj.Raw, &unstructured)
- if err != nil {
- return errored(request.UID, err)
- }
- haveAPIVersion := unstructured.GetAPIVersion()
- if desiredAPIVersion == haveAPIVersion {
- return errored(request.UID, fmt.Errorf("conversion from a version to itself should not call the webhook: %s", haveAPIVersion))
- }
-
- var (
- raw []byte
- object runtime.Object
- convertErr error
- )
- switch desiredAPIVersion {
- case "tf.isaaguilar.com/v1alpha1":
- switch haveAPIVersion {
- case "tf.isaaguilar.com/v1alpha2":
- raw, object, convertErr = convert.ConvertV1alpha2ToV1alpha1(obj.Raw)
- default:
- return errored(request.UID, fmt.Errorf("unexpected conversion version %s", haveAPIVersion))
-
- }
- case "tf.isaaguilar.com/v1alpha2":
- switch haveAPIVersion {
- case "tf.isaaguilar.com/v1alpha1":
- raw, object, convertErr = convert.ConvertV1alpha1ToV1alpha2(obj.Raw)
- default:
- return errored(request.UID, fmt.Errorf("unexpected conversion version %s", haveAPIVersion))
- }
- default:
- return errored(request.UID, fmt.Errorf("unexpected desired version %s", desiredAPIVersion))
- }
-
- if convertErr != nil {
- return errored(request.UID, fmt.Errorf("error in conversion from %s to %s: %s", desiredAPIVersion, haveAPIVersion, convertErr))
- }
- responseObjects[i] = runtime.RawExtension{
- Raw: raw,
- Object: object,
- }
- }
-
- return &apiextensionsv1.ConversionResponse{
- UID: request.UID,
- ConvertedObjects: responseObjects,
- Result: metav1.Status{
- Status: metav1.StatusSuccess,
- },
- }, http.StatusOK
-}
diff --git a/pkg/webhook/admission/convert/v1alpha1_to_v1alpha2.go b/pkg/webhook/admission/convert/v1alpha1_to_v1alpha2.go
deleted file mode 100644
index 755553a74f0d0a05a3f9e8daf98f142d002fbd9e..0000000000000000000000000000000000000000
--- a/pkg/webhook/admission/convert/v1alpha1_to_v1alpha2.go
+++ /dev/null
@@ -1,329 +0,0 @@
-package convert
-
-import (
- "encoding/json"
- "fmt"
-
- tfv1alpha1 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1"
- tfv1alpha2 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2"
- corev1 "k8s.io/api/core/v1"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/apimachinery/pkg/runtime"
-)
-
-func ConvertV1alpha1ToV1alpha2(rawRequest []byte) ([]byte, runtime.Object, error) {
-
- want := tfv1alpha2.Terraform{}
- have := tfv1alpha1.Terraform{}
-
- err := json.Unmarshal(rawRequest, &have)
- if err != nil {
- return []byte{}, &want, err
- }
-
- fmt.Printf("Should convert %s/%s from %s to %s\n", have.Namespace, have.Name, tfv1alpha1.SchemeGroupVersion, tfv1alpha2.SchemeGroupVersion)
-
- want.TypeMeta = metav1.TypeMeta{
- Kind: "Terraform",
- APIVersion: tfv1alpha2.SchemeGroupVersion.String(),
- }
- want.ObjectMeta = have.ObjectMeta
- want.Spec.TerraformVersion = have.Spec.TerraformVersion
- want.Spec.TerraformModule.Source = have.Spec.TerraformModule
- want.Spec.TerraformModule.Inline = have.Spec.TerraformModuleInline
- want.Spec.TerraformModule.ConfigMapSelector = (*tfv1alpha2.ConfigMapSelector)(have.Spec.TerraformModuleConfigMap)
- want.Spec.Backend = have.Spec.CustomBackend
- want.Spec.IgnoreDelete = have.Spec.IgnoreDelete
- want.Spec.KeepCompletedPods = have.Spec.KeepCompletedPods
- want.Spec.KeepLatestPodsOnly = have.Spec.KeepLatestPodsOnly
- want.Spec.WriteOutputsToStatus = have.Spec.WriteOutputsToStatus
- want.Spec.OutputsSecret = have.Spec.OutputsSecret
- want.Spec.PersistentVolumeSize = have.Spec.PersistentVolumeSize
- want.Spec.OutputsToInclude = have.Spec.OutputsToInclude
- want.Spec.OutputsToOmit = have.Spec.OutputsToOmit
- want.Spec.ServiceAccount = have.Spec.ServiceAccount
-
- if storageClassName, ok := have.Annotations["v1alpha2.tf.isaaguilar.com/storageClassName"]; ok {
- want.Spec.StorageClassName = &storageClassName
- }
-
- scriptImageConfig := convertImageConfig("script", have.Spec.ScriptRunner, have.Spec.ScriptRunnerVersion, have.Spec.ScriptRunnerPullPolicy)
- terraformImageConfig := convertImageConfig("terraform", have.Spec.TerraformRunner, "", have.Spec.TerraformRunnerPullPolicy)
- setupImageConfig := convertImageConfig("setup", have.Spec.SetupRunner, have.Spec.SetupRunnerVersion, have.Spec.SetupRunnerPullPolicy)
- images := tfv1alpha2.Images{
- Terraform: terraformImageConfig,
- Setup: setupImageConfig,
- Script: scriptImageConfig,
- }
- if scriptImageConfig != nil || terraformImageConfig != nil || setupImageConfig != nil {
- want.Spec.Images = &images
- }
-
- for _, credentials := range have.Spec.Credentials {
- want.Spec.Credentials = append(want.Spec.Credentials, tfv1alpha2.Credentials{
- SecretNameRef: tfv1alpha2.SecretNameRef(credentials.SecretNameRef),
- AWSCredentials: tfv1alpha2.AWSCredentials(credentials.AWSCredentials),
- ServiceAccountAnnotations: credentials.ServiceAccountAnnotations,
- })
- }
-
- if have.Spec.SSHTunnel != nil {
- want.Spec.SSHTunnel = &tfv1alpha2.ProxyOpts{
- Host: have.Spec.SSHTunnel.Host,
- User: have.Spec.SSHTunnel.User,
- SSHKeySecretRef: tfv1alpha2.SSHKeySecretRef(have.Spec.SSHTunnel.SSHKeySecretRef),
- }
- }
-
- for _, scmAuthMethod := range have.Spec.SCMAuthMethods {
- var gitScmAuthMethod *tfv1alpha2.GitSCM
- if scmAuthMethod.Git != nil {
- var gitSSH *tfv1alpha2.GitSSH
- if scmAuthMethod.Git.SSH != nil {
- gitSSH = &tfv1alpha2.GitSSH{
- RequireProxy: scmAuthMethod.Git.SSH.RequireProxy,
- SSHKeySecretRef: (*tfv1alpha2.SSHKeySecretRef)(scmAuthMethod.Git.SSH.SSHKeySecretRef),
- }
- }
- var gitHTTPS *tfv1alpha2.GitHTTPS
- if scmAuthMethod.Git.HTTPS != nil {
- gitHTTPS = &tfv1alpha2.GitHTTPS{
- RequireProxy: scmAuthMethod.Git.HTTPS.RequireProxy,
- TokenSecretRef: (*tfv1alpha2.TokenSecretRef)(scmAuthMethod.Git.HTTPS.TokenSecretRef),
- }
- }
- gitScmAuthMethod = &tfv1alpha2.GitSCM{
- SSH: gitSSH,
- HTTPS: gitHTTPS,
- }
- }
- want.Spec.SCMAuthMethods = append(want.Spec.SCMAuthMethods, tfv1alpha2.SCMAuthMethod{
- Host: scmAuthMethod.Host,
- Git: gitScmAuthMethod,
- })
- }
-
- want.Spec.TaskOptions = []tfv1alpha2.TaskOption{}
-
- if len(have.Spec.Env) > 0 ||
- len(have.Spec.RunnerRules) > 0 ||
- len(have.Spec.RunnerAnnotations) > 0 ||
- len(have.Spec.RunnerLabels) > 0 {
-
- taskOption := tfv1alpha2.TaskOption{
- For: []tfv1alpha2.TaskName{"*"},
- }
-
- if len(have.Spec.Env) > 0 {
- taskOption.Env = have.Spec.Env
- }
- if len(have.Spec.RunnerRules) > 0 {
- taskOption.PolicyRules = have.Spec.RunnerRules
- }
- if len(have.Spec.RunnerAnnotations) > 0 {
- taskOption.Annotations = have.Spec.RunnerAnnotations
- }
- if len(have.Spec.RunnerLabels) > 0 {
- taskOption.Labels = have.Spec.RunnerLabels
- }
- want.Spec.TaskOptions = append(want.Spec.TaskOptions, taskOption)
- }
-
- // NOTICE: ScriptRunnerExecutionScriptConfigMap is not supported. Instead,
- // use a different Container Image to change the ENTRYPOINT. Changing the
- // ENRYPOINT was the intended behaviour of *ExecutionScriptConfigMap
- // options.
- //
- // Note that both
- // - terraformRunnerExecutionScriptConfigMap &
- // - setupRunnerExecutionScriptConfigMap
- // will be used as as scripts that their respective Containers execute.
- //
- // In practice, the use of the *ExecutionScriptConfigMap was not adopted and
- // will lose support in favor of TaskOptions Script.
- if have.Spec.TerraformRunnerExecutionScriptConfigMap != nil {
- terraformRunnerExecutionScriptConfigMap := &tfv1alpha1.ConfigMapSelector{
- Name: have.Spec.TerraformRunnerExecutionScriptConfigMap.Name,
- Key: have.Spec.TerraformRunnerExecutionScriptConfigMap.Key,
- }
- convertRunScriptsToTaskConfigMapSelector(terraformRunnerExecutionScriptConfigMap, tfv1alpha2.RunInit, &want.Spec.TaskOptions)
- convertRunScriptsToTaskConfigMapSelector(terraformRunnerExecutionScriptConfigMap, tfv1alpha2.RunPlan, &want.Spec.TaskOptions)
- convertRunScriptsToTaskConfigMapSelector(terraformRunnerExecutionScriptConfigMap, tfv1alpha2.RunApply, &want.Spec.TaskOptions)
- convertRunScriptsToTaskConfigMapSelector(terraformRunnerExecutionScriptConfigMap, tfv1alpha2.RunInitDelete, &want.Spec.TaskOptions)
- convertRunScriptsToTaskConfigMapSelector(terraformRunnerExecutionScriptConfigMap, tfv1alpha2.RunPlanDelete, &want.Spec.TaskOptions)
- convertRunScriptsToTaskConfigMapSelector(terraformRunnerExecutionScriptConfigMap, tfv1alpha2.RunApplyDelete, &want.Spec.TaskOptions)
- }
-
- if have.Spec.SetupRunnerExecutionScriptConfigMap != nil {
- setupRunnerExecutionScriptConfigMap := &tfv1alpha1.ConfigMapSelector{
- Name: have.Spec.SetupRunnerExecutionScriptConfigMap.Name,
- Key: have.Spec.SetupRunnerExecutionScriptConfigMap.Key,
- }
- convertRunScriptsToTaskConfigMapSelector(setupRunnerExecutionScriptConfigMap, tfv1alpha2.RunSetup, &want.Spec.TaskOptions)
- convertRunScriptsToTaskConfigMapSelector(setupRunnerExecutionScriptConfigMap, tfv1alpha2.RunSetupDelete, &want.Spec.TaskOptions)
- }
-
- convertRunScriptsToTaskInlineScripts(have.Spec.PreInitScript, tfv1alpha2.RunPreInit, &want.Spec.TaskOptions)
- convertRunScriptsToTaskInlineScripts(have.Spec.PostInitScript, tfv1alpha2.RunPostInit, &want.Spec.TaskOptions)
- convertRunScriptsToTaskInlineScripts(have.Spec.PrePlanScript, tfv1alpha2.RunPrePlan, &want.Spec.TaskOptions)
- convertRunScriptsToTaskInlineScripts(have.Spec.PostPlanScript, tfv1alpha2.RunPostPlan, &want.Spec.TaskOptions)
- convertRunScriptsToTaskInlineScripts(have.Spec.PreApplyScript, tfv1alpha2.RunPreApply, &want.Spec.TaskOptions)
- convertRunScriptsToTaskInlineScripts(have.Spec.PostApplyScript, tfv1alpha2.RunPostApply, &want.Spec.TaskOptions)
- convertRunScriptsToTaskInlineScripts(have.Spec.PreInitDeleteScript, tfv1alpha2.RunPreInitDelete, &want.Spec.TaskOptions)
- convertRunScriptsToTaskInlineScripts(have.Spec.PostInitDeleteScript, tfv1alpha2.RunPostInitDelete, &want.Spec.TaskOptions)
- convertRunScriptsToTaskInlineScripts(have.Spec.PrePlanDeleteScript, tfv1alpha2.RunPrePlanDelete, &want.Spec.TaskOptions)
- convertRunScriptsToTaskInlineScripts(have.Spec.PostPlanDeleteScript, tfv1alpha2.RunPostPlanDelete, &want.Spec.TaskOptions)
- convertRunScriptsToTaskInlineScripts(have.Spec.PreApplyDeleteScript, tfv1alpha2.RunPreApplyDelete, &want.Spec.TaskOptions)
- convertRunScriptsToTaskInlineScripts(have.Spec.PostApplyDeleteScript, tfv1alpha2.RunPostApplyDelete, &want.Spec.TaskOptions)
-
- if want.Spec.Setup == nil {
- want.Spec.Setup = &tfv1alpha2.Setup{}
- }
- want.Spec.Setup.CleanupDisk = have.Spec.CleanupDisk
- for _, resourceDownload := range have.Spec.ResourceDownloads {
- if resourceDownload != nil {
- want.Spec.Setup.ResourceDownloads = append(want.Spec.Setup.ResourceDownloads, tfv1alpha2.ResourceDownload(*resourceDownload))
- }
- }
-
- // Status is very important so TFO can continue where it left from last version
- want.Status.PodNamePrefix = have.Status.PodNamePrefix
- want.Status.Stages = []tfv1alpha2.Stage{}
- for _, stage := range have.Status.Stages {
- want.Status.Stages = append(want.Status.Stages, tfv1alpha2.Stage{
- Generation: stage.Generation,
- State: tfv1alpha2.StageState(stage.State),
- TaskType: TaskNameFromPodType(stage.PodType),
- Interruptible: tfv1alpha2.Interruptible(stage.Interruptible),
- Reason: stage.Reason,
- StartTime: stage.StartTime,
- StopTime: stage.StopTime,
- })
- }
- if len(have.Status.Stages) > 0 {
- lastStage := have.Status.Stages[len(have.Status.Stages)-1]
- want.Status.Stage = tfv1alpha2.Stage{
- Generation: lastStage.Generation,
- State: tfv1alpha2.StageState(lastStage.State),
- TaskType: TaskNameFromPodType(lastStage.PodType),
- Interruptible: tfv1alpha2.Interruptible(lastStage.Interruptible),
- Reason: lastStage.Reason,
- StartTime: lastStage.StartTime,
- StopTime: lastStage.StopTime,
- PodName: "",
- Message: "",
- }
- }
- want.Status.Phase = tfv1alpha2.StatusPhase(have.Status.Phase)
- want.Status.Plugins = []tfv1alpha2.TaskName{}
- want.Status.LastCompletedGeneration = have.Status.LastCompletedGeneration
-
- // Finally store the original v1alpha1 contents in it's entirety into an annotation that can be used to
- // load into the old resource to continue to work with v1alpha1
- if want.ObjectMeta.Annotations == nil {
- want.ObjectMeta.Annotations = map[string]string{}
- }
- v1alpha1TerraformJSON, _ := json.Marshal(have)
- want.ObjectMeta.Annotations["tf.isaaguilar.com/v1alpha1_terraforms"] = string(v1alpha1TerraformJSON)
-
- rawResponse, _ := json.Marshal(want)
-
- return rawResponse, &want, nil
-}
-
-func TaskNameFromPodType(podType tfv1alpha1.PodType) tfv1alpha2.TaskName {
-
- conversionMap := map[tfv1alpha1.PodType]tfv1alpha2.TaskName{
- tfv1alpha1.PodSetupDelete: tfv1alpha2.RunSetupDelete,
- tfv1alpha1.PodPreInitDelete: tfv1alpha2.RunPreInitDelete,
- tfv1alpha1.PodInitDelete: tfv1alpha2.RunInitDelete,
- tfv1alpha1.PodPostInitDelete: tfv1alpha2.RunPostInitDelete,
- tfv1alpha1.PodPrePlanDelete: tfv1alpha2.RunPrePlanDelete,
- tfv1alpha1.PodPlanDelete: tfv1alpha2.RunPlanDelete,
- tfv1alpha1.PodPostPlanDelete: tfv1alpha2.RunPostPlanDelete,
- tfv1alpha1.PodPreApplyDelete: tfv1alpha2.RunPreApplyDelete,
- tfv1alpha1.PodApplyDelete: tfv1alpha2.RunApplyDelete,
- tfv1alpha1.PodPostApplyDelete: tfv1alpha2.RunPostApplyDelete,
-
- tfv1alpha1.PodSetup: tfv1alpha2.RunSetup,
- tfv1alpha1.PodPreInit: tfv1alpha2.RunPreInit,
- tfv1alpha1.PodInit: tfv1alpha2.RunInit,
- tfv1alpha1.PodPostInit: tfv1alpha2.RunPostInit,
- tfv1alpha1.PodPrePlan: tfv1alpha2.RunPrePlan,
- tfv1alpha1.PodPlan: tfv1alpha2.RunPlan,
- tfv1alpha1.PodPostPlan: tfv1alpha2.RunPostPlan,
- tfv1alpha1.PodPreApply: tfv1alpha2.RunPreApply,
- tfv1alpha1.PodApply: tfv1alpha2.RunApply,
- tfv1alpha1.PodPostApply: tfv1alpha2.RunPostApply,
- tfv1alpha1.PodNil: tfv1alpha2.RunNil,
- }
-
- return conversionMap[podType]
-
-}
-
-func convertRunScriptsToTaskConfigMapSelector(configMapSelector *tfv1alpha1.ConfigMapSelector, task tfv1alpha2.TaskName, taskOptions *[]tfv1alpha2.TaskOption) {
- if configMapSelector != nil {
- *taskOptions = append(*taskOptions, tfv1alpha2.TaskOption{
- For: []tfv1alpha2.TaskName{task},
- Script: tfv1alpha2.StageScript{
- ConfigMapSelector: (*tfv1alpha2.ConfigMapSelector)(configMapSelector),
- },
- })
- }
-}
-
-func convertRunScriptsToTaskInlineScripts(inlineScript string, task tfv1alpha2.TaskName, taskOptions *[]tfv1alpha2.TaskOption) {
- if inlineScript != "" {
- *taskOptions = append(*taskOptions, tfv1alpha2.TaskOption{
- For: []tfv1alpha2.TaskName{task},
- Script: tfv1alpha2.StageScript{
- Inline: inlineScript,
- },
- })
- }
-}
-
-func convertImageConfig(imageType, repo, version string, imagePullPolicy corev1.PullPolicy) *tfv1alpha2.ImageConfig {
- defaults := map[string]map[string]string{
- "script": {
- "tag": tfv1alpha2.ScriptTaskImageTagDefault,
- "image": tfv1alpha2.ScriptTaskImageRepoDefault,
- },
- "terraform": {
- "image": tfv1alpha2.TerraformTaskImageRepoDefault,
- },
- "setup": {
- "image": tfv1alpha2.SetupTaskImageRepoDefault,
- "tag": tfv1alpha2.SetupTaskImageTagDefault,
- },
- }
- var imageConfig *tfv1alpha2.ImageConfig
- if repo != "" || version != "" || imagePullPolicy != "" {
- image := ""
- var imagePullPolicy corev1.PullPolicy
- if repo != "" {
- image = repo
- } else {
- if value, ok := defaults[imageType]["image"]; ok {
- image = value
- }
- }
- if version != "" {
- image += ":" + version
- } else {
- if value, ok := defaults[imageType]["tag"]; ok {
- image += ":" + value
- }
- }
- if imagePullPolicy == "" {
- imagePullPolicy = "Always"
- }
- imageConfig = &tfv1alpha2.ImageConfig{
- Image: image,
- ImagePullPolicy: imagePullPolicy,
- }
- }
-
- return imageConfig
-}
diff --git a/pkg/webhook/admission/convert/v1alpha2_to_v1alpha1.go b/pkg/webhook/admission/convert/v1alpha2_to_v1alpha1.go
deleted file mode 100644
index 59d0d40e9fdd9325c0dd641000e3107528462be8..0000000000000000000000000000000000000000
--- a/pkg/webhook/admission/convert/v1alpha2_to_v1alpha1.go
+++ /dev/null
@@ -1,437 +0,0 @@
-package convert
-
-import (
- "encoding/json"
- "log"
- "regexp"
- "strings"
- "time"
-
- tfv1alpha1 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha1"
- tfv1alpha2 "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2"
- corev1 "k8s.io/api/core/v1"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/apimachinery/pkg/runtime"
-)
-
-func ConvertV1alpha2ToV1alpha1(rawRequest []byte) ([]byte, runtime.Object, error) {
- start := time.Now()
- want := tfv1alpha1.Terraform{}
- have := tfv1alpha2.Terraform{}
-
- err := json.Unmarshal(rawRequest, &have)
- if err != nil {
- // The request to convert cannot be converted and will continue to fail because what is already
- // stored in kubernetes has been malformed or corrupted.
-
- // Perhaps the rawRequest accidentally has the wrong version stored. Can the request be
- // unmarshalled as the desired response?
- err := json.Unmarshal(rawRequest, &want)
- if err != nil {
- return []byte{}, &want, err
- }
- want.TypeMeta = metav1.TypeMeta{
- Kind: "Terraform",
- APIVersion: tfv1alpha1.SchemeGroupVersion.String(),
- }
- rawResponse, _ := json.Marshal(want)
- return rawResponse, &want, nil
-
- }
-
- log.Printf("Should convert %s/%s from %s to %s\n", have.Namespace, have.Name, tfv1alpha2.SchemeGroupVersion, tfv1alpha1.SchemeGroupVersion)
-
- if v1alpha1TerraformJSON, found := have.Annotations["tf.isaaguilar.com/v1alpha1_terraforms"]; found {
- err := json.Unmarshal([]byte(v1alpha1TerraformJSON), &want)
- if err != nil {
- want.TypeMeta = metav1.TypeMeta{
- Kind: "Terraform",
- APIVersion: tfv1alpha1.SchemeGroupVersion.String(),
- }
- rawResponse, _ := json.Marshal(want)
- return rawResponse, &want, nil
- }
- } else {
- // The annotation in v1alpha2 was not found and must now be manually generated. Generally
- // when this annotation is missing it means that the resource never existed as v1alpha1 and therefore
- // will not require backporting, but just in case, the following is the best attempt to translate
- // the apis.
- want.TypeMeta = metav1.TypeMeta{
- Kind: "Terraform",
- APIVersion: tfv1alpha1.SchemeGroupVersion.String(),
- }
- want.ObjectMeta = have.ObjectMeta
- want.Spec.TerraformVersion = have.Spec.TerraformVersion
- want.Spec.TerraformModule = have.Spec.TerraformModule.Source
- want.Spec.TerraformModuleInline = have.Spec.TerraformModule.Inline
- want.Spec.TerraformModuleConfigMap = (*tfv1alpha1.ConfigMapSelector)(have.Spec.TerraformModule.ConfigMapSelector)
- want.Spec.CustomBackend = have.Spec.Backend
- want.Spec.IgnoreDelete = have.Spec.IgnoreDelete
- want.Spec.KeepCompletedPods = have.Spec.KeepCompletedPods
- want.Spec.KeepLatestPodsOnly = have.Spec.KeepLatestPodsOnly
- want.Spec.WriteOutputsToStatus = have.Spec.WriteOutputsToStatus
- want.Spec.OutputsSecret = have.Spec.OutputsSecret
- want.Spec.PersistentVolumeSize = have.Spec.PersistentVolumeSize
- want.Spec.OutputsToInclude = have.Spec.OutputsToInclude
- want.Spec.OutputsToOmit = have.Spec.OutputsToOmit
- want.Spec.ServiceAccount = have.Spec.ServiceAccount
-
- if have.Spec.StorageClassName != nil {
- if want.Annotations == nil {
- want.Annotations = map[string]string{}
- }
- want.Annotations["v1alpha2.tf.isaaguilar.com/storageClassName"] = *have.Spec.StorageClassName
- }
-
- if have.Spec.Images != nil {
- if have.Spec.Images.Script != nil {
- image := ""
- tag := ""
- var pullPolicy corev1.PullPolicy
- if have.Spec.Images.Script.Image != "" {
- // Simple regex checks for the components of the image
- a := strings.Split(have.Spec.Images.Script.Image, ":")
- i := len(a)
- if i == 1 {
- // Does not contain ":" meaning no tag present
- image = have.Spec.Images.Script.Image
- tag = tfv1alpha2.SetupTaskImageTagDefault
- } else {
- // Checks if last item behind ":" is tag-like
- re := regexp.MustCompile("^[a-zA-Z0-9._-]*$")
- if re.MatchString(a[i-1]) {
- image = strings.Join(a[:i-1], ":")
- tag = a[i-1]
- } else {
- image = have.Spec.Images.Script.Image
- tag = tfv1alpha2.SetupTaskImageTagDefault
- }
- }
- }
- if have.Spec.Images.Script.ImagePullPolicy != "" {
- pullPolicy = have.Spec.Images.Script.ImagePullPolicy
- }
- if image != "" {
- want.Spec.ScriptRunner = image
- }
- if tag != "" {
- want.Spec.ScriptRunnerVersion = tag
- }
- if pullPolicy != "" {
- want.Spec.ScriptRunnerPullPolicy = pullPolicy
- }
- }
-
- if have.Spec.Images.Terraform != nil {
- image := ""
- var pullPolicy corev1.PullPolicy
- if have.Spec.Images.Terraform.Image != "" {
- // Simple regex checks for the components of the image
- a := strings.Split(have.Spec.Images.Terraform.Image, ":")
- i := len(a)
- if i == 1 {
- // Does not contain ":" meaning no tag present
- image = have.Spec.Images.Terraform.Image
- } else {
- // Checks if last item behind ":" is tag-like
- re := regexp.MustCompile("^[a-zA-Z0-9._-]*$")
- if re.MatchString(a[i-1]) {
- image = strings.Join(a[:i-1], ":")
- } else {
- image = have.Spec.Images.Terraform.Image
- }
- }
- }
- if have.Spec.Images.Script.ImagePullPolicy != "" {
- pullPolicy = have.Spec.Images.Script.ImagePullPolicy
- }
- if image != "" {
- want.Spec.TerraformRunner = image
- }
- if pullPolicy != "" {
- want.Spec.TerraformRunnerPullPolicy = pullPolicy
- }
- }
-
- if have.Spec.Images.Setup != nil {
- image := ""
- tag := ""
- var pullPolicy corev1.PullPolicy
- if have.Spec.Images.Setup.Image != "" {
- // Simple regex checks for the components of the image
- a := strings.Split(have.Spec.Images.Setup.Image, ":")
- i := len(a)
- if i == 1 {
- // Does not contain ":" meaning no tag present
- image = have.Spec.Images.Setup.Image
- tag = tfv1alpha2.SetupTaskImageTagDefault
- } else {
- // Checks if last item behind ":" is tag-like
- re := regexp.MustCompile("^[a-zA-Z0-9._-]*$")
- if re.MatchString(a[i-1]) {
- image = strings.Join(a[:i-1], ":")
- tag = a[i-1]
- } else {
- image = have.Spec.Images.Setup.Image
- tag = tfv1alpha2.SetupTaskImageTagDefault
- }
- }
- }
- if have.Spec.Images.Setup.ImagePullPolicy != "" {
- pullPolicy = have.Spec.Images.Setup.ImagePullPolicy
- }
- if image != "" {
- want.Spec.SetupRunner = image
- }
- if tag != "" {
- want.Spec.SetupRunnerVersion = tag
- }
- if pullPolicy != "" {
- want.Spec.SetupRunnerPullPolicy = pullPolicy
- }
- }
- }
-
- for _, credentials := range have.Spec.Credentials {
- want.Spec.Credentials = append(want.Spec.Credentials, tfv1alpha1.Credentials{
- SecretNameRef: tfv1alpha1.SecretNameRef(credentials.SecretNameRef),
- AWSCredentials: tfv1alpha1.AWSCredentials(credentials.AWSCredentials),
- ServiceAccountAnnotations: credentials.ServiceAccountAnnotations,
- })
- }
-
- if have.Spec.SSHTunnel != nil {
- want.Spec.SSHTunnel = &tfv1alpha1.ProxyOpts{
- Host: have.Spec.SSHTunnel.Host,
- User: have.Spec.SSHTunnel.User,
- SSHKeySecretRef: tfv1alpha1.SSHKeySecretRef(have.Spec.SSHTunnel.SSHKeySecretRef),
- }
- }
-
- for _, scmAuthMethod := range have.Spec.SCMAuthMethods {
- var gitScmAuthMethod *tfv1alpha1.GitSCM
- if scmAuthMethod.Git != nil {
- var gitSSH *tfv1alpha1.GitSSH
- if scmAuthMethod.Git.SSH != nil {
- gitSSH = &tfv1alpha1.GitSSH{
- RequireProxy: scmAuthMethod.Git.SSH.RequireProxy,
- SSHKeySecretRef: (*tfv1alpha1.SSHKeySecretRef)(scmAuthMethod.Git.SSH.SSHKeySecretRef),
- }
- }
- var gitHTTPS *tfv1alpha1.GitHTTPS
- if scmAuthMethod.Git.HTTPS != nil {
- gitHTTPS = &tfv1alpha1.GitHTTPS{
- RequireProxy: scmAuthMethod.Git.HTTPS.RequireProxy,
- TokenSecretRef: (*tfv1alpha1.TokenSecretRef)(scmAuthMethod.Git.HTTPS.TokenSecretRef),
- }
- }
- gitScmAuthMethod = &tfv1alpha1.GitSCM{
- SSH: gitSSH,
- HTTPS: gitHTTPS,
- }
- }
- want.Spec.SCMAuthMethods = append(want.Spec.SCMAuthMethods, tfv1alpha1.SCMAuthMethod{
- Host: scmAuthMethod.Host,
- Git: gitScmAuthMethod,
- })
- }
-
- // TaskOptions is where v1alpha1 and v1alpha2 conversions break down. Some items cannot be back-ported
- // and will be omitted in this conversion. The idea here is that users that have configured v1alpha2
- // will not move back to v1alpha1 and the new features do not need to be added.
- //
- // This is an attempt to make v1alpha1 as close as possible to v1alpha2 so users can continue to use
- // v1alpha1 which will allow their resources to accept patching and updates. This is important for
- // helm users when `helm upgrade` is used.
- if len(have.Spec.TaskOptions) > 0 {
- for _, opts := range have.Spec.TaskOptions {
- if len(opts.For) > 0 {
- // only check for the global options first
- if opts.For[0] != "*" {
- continue
- }
- want.Spec.Env = opts.Env
- want.Spec.RunnerAnnotations = opts.Annotations
- want.Spec.RunnerLabels = opts.Labels
- want.Spec.RunnerRules = opts.PolicyRules
- }
- }
-
- //
- // The condition where there is a configmap for all terraform tasks translates to having TerraformRunnerExecutionScriptConfigMap
- //
- terraformTaskTypes := []tfv1alpha2.TaskName{
- tfv1alpha2.RunInitDelete,
- tfv1alpha2.RunPlanDelete,
- tfv1alpha2.RunApplyDelete,
- tfv1alpha2.RunInit,
- tfv1alpha2.RunPlan,
- tfv1alpha2.RunApply,
- }
- terraformTaskOptionsContainingConfigMapSelector := []tfv1alpha2.TaskName{}
- terraformTaskOptionConfigMapSelector := &tfv1alpha2.ConfigMapSelector{}
- for _, opts := range have.Spec.TaskOptions {
- if len(opts.For) == 1 {
- if tfv1alpha2.ListContainsTask(terraformTaskTypes, opts.For[0]) && opts.Script.ConfigMapSelector != nil {
- if !tfv1alpha2.ListContainsTask(terraformTaskOptionsContainingConfigMapSelector, opts.For[0]) {
- // Only true if the same configmap is used for all terraform tasks
- if terraformTaskOptionConfigMapSelector.Name != "" && terraformTaskOptionConfigMapSelector.Name != opts.Script.ConfigMapSelector.Name {
- break
- }
- if terraformTaskOptionConfigMapSelector.Key != "" && terraformTaskOptionConfigMapSelector.Key != opts.Script.ConfigMapSelector.Key {
- break
- }
- terraformTaskOptionsContainingConfigMapSelector = append(terraformTaskOptionsContainingConfigMapSelector, opts.For[0])
- terraformTaskOptionConfigMapSelector = opts.Script.ConfigMapSelector
- }
- }
- }
- }
- if len(terraformTaskOptionsContainingConfigMapSelector) == len(terraformTaskTypes) && terraformTaskOptionConfigMapSelector != nil {
- configMapKeySelector := corev1.ConfigMapKeySelector{
- Key: terraformTaskOptionConfigMapSelector.Key,
- LocalObjectReference: corev1.LocalObjectReference{
- Name: terraformTaskOptionConfigMapSelector.Name,
- },
- }
- want.Spec.TerraformRunnerExecutionScriptConfigMap = &configMapKeySelector
- }
-
- //
- // The condition where there is a configmap for all setup tasks translates to having SetupRunnerExecutionScriptConfigMap
- //
- setupTaskTypes := []tfv1alpha2.TaskName{
- tfv1alpha2.RunSetupDelete,
- tfv1alpha2.RunSetup,
- }
- setupTaskOptionsContainingConfigMapSelector := []tfv1alpha2.TaskName{}
- setupTaskOptionConfigMapSelector := &tfv1alpha2.ConfigMapSelector{}
- for _, opts := range have.Spec.TaskOptions {
- if len(opts.For) == 1 {
- if tfv1alpha2.ListContainsTask(setupTaskTypes, opts.For[0]) && opts.Script.ConfigMapSelector != nil {
- if !tfv1alpha2.ListContainsTask(setupTaskOptionsContainingConfigMapSelector, opts.For[0]) {
- if setupTaskOptionConfigMapSelector.Name != "" && setupTaskOptionConfigMapSelector.Name != opts.Script.ConfigMapSelector.Name {
- break
- }
- if setupTaskOptionConfigMapSelector.Key != "" && setupTaskOptionConfigMapSelector.Key != opts.Script.ConfigMapSelector.Key {
- break
- }
- setupTaskOptionsContainingConfigMapSelector = append(setupTaskOptionsContainingConfigMapSelector, opts.For[0])
- setupTaskOptionConfigMapSelector = opts.Script.ConfigMapSelector
- }
- }
- }
- }
- if len(setupTaskOptionsContainingConfigMapSelector) == len(setupTaskTypes) && setupTaskOptionConfigMapSelector != nil {
- configMapKeySelector := corev1.ConfigMapKeySelector{
- Key: setupTaskOptionConfigMapSelector.Key,
- LocalObjectReference: corev1.LocalObjectReference{
- Name: setupTaskOptionConfigMapSelector.Name,
- },
- }
- want.Spec.SetupRunnerExecutionScriptConfigMap = &configMapKeySelector
- }
-
- //
- // Find inline scripts and translate them into spec.<scripts> (eg spec.prePlanScript)
- //
- for _, opts := range have.Spec.TaskOptions {
- if len(opts.For) == 1 {
- if opts.Script.Inline != "" {
- convertInlineScriptFromTaskOptions(opts.For[0], opts.Script.Inline, &want)
- }
- }
- }
-
- }
-
- if have.Spec.Setup != nil {
- if have.Spec.Setup.ResourceDownloads != nil {
- for _, resourceDownload := range have.Spec.Setup.ResourceDownloads {
- want.Spec.ResourceDownloads = append(want.Spec.ResourceDownloads, (*tfv1alpha1.ResourceDownload)(&resourceDownload))
- }
- }
- want.Spec.CleanupDisk = have.Spec.Setup.CleanupDisk
- }
- }
-
- // Status is very important so TFO can continue where it left from last version
- want.Status.PodNamePrefix = have.Status.PodNamePrefix
- want.Status.Stages = []tfv1alpha1.Stage{
- {
- Generation: have.Status.Stage.Generation,
- State: tfv1alpha1.StageState(have.Status.Stage.State),
- PodType: tfv1alpha1.PodType(have.Status.Stage.TaskType),
- Interruptible: tfv1alpha1.Interruptible(have.Status.Stage.Interruptible),
- Reason: have.Status.Stage.Reason,
- StartTime: have.Status.Stage.StartTime,
- StopTime: have.Status.Stage.StopTime,
- },
- }
- want.Status.Phase = tfv1alpha1.StatusPhase(have.Status.Phase)
- want.Status.Exported = tfv1alpha1.ExportedFalse
- want.Status.LastCompletedGeneration = have.Status.LastCompletedGeneration
- rawResponse, _ := json.Marshal(want)
- log.Print("took ", time.Since(start).String(), " to complete conversion")
- return rawResponse, &want, nil
-}
-
-func PodTypeFromTaskName(taskName tfv1alpha2.TaskName) tfv1alpha1.PodType {
-
- conversionMap := map[tfv1alpha2.TaskName]tfv1alpha1.PodType{
- tfv1alpha2.RunSetupDelete: tfv1alpha1.PodSetupDelete,
- tfv1alpha2.RunPreInitDelete: tfv1alpha1.PodPreInitDelete,
- tfv1alpha2.RunInitDelete: tfv1alpha1.PodInitDelete,
- tfv1alpha2.RunPostInitDelete: tfv1alpha1.PodPostInitDelete,
- tfv1alpha2.RunPrePlanDelete: tfv1alpha1.PodPrePlanDelete,
- tfv1alpha2.RunPlanDelete: tfv1alpha1.PodPlanDelete,
- tfv1alpha2.RunPostPlanDelete: tfv1alpha1.PodPostPlanDelete,
- tfv1alpha2.RunPreApplyDelete: tfv1alpha1.PodPreApplyDelete,
- tfv1alpha2.RunApplyDelete: tfv1alpha1.PodApplyDelete,
- tfv1alpha2.RunPostApplyDelete: tfv1alpha1.PodPostApplyDelete,
-
- tfv1alpha2.RunSetup: tfv1alpha1.PodSetup,
- tfv1alpha2.RunPreInit: tfv1alpha1.PodPreInit,
- tfv1alpha2.RunInit: tfv1alpha1.PodInit,
- tfv1alpha2.RunPostInit: tfv1alpha1.PodPostInit,
- tfv1alpha2.RunPrePlan: tfv1alpha1.PodPrePlan,
- tfv1alpha2.RunPlan: tfv1alpha1.PodPlan,
- tfv1alpha2.RunPostPlan: tfv1alpha1.PodPostPlan,
- tfv1alpha2.RunPreApply: tfv1alpha1.PodPreApply,
- tfv1alpha2.RunApply: tfv1alpha1.PodApply,
- tfv1alpha2.RunPostApply: tfv1alpha1.PodPostApply,
- tfv1alpha2.RunNil: tfv1alpha1.PodNil,
- }
-
- return conversionMap[taskName]
-
-}
-
-func convertInlineScriptFromTaskOptions(taskName tfv1alpha2.TaskName, scriptContents string, want *tfv1alpha1.Terraform) {
- switch PodTypeFromTaskName(taskName) {
- case tfv1alpha1.PodPreInit:
- want.Spec.PreInitScript = scriptContents
- case tfv1alpha1.PodPostInit:
- want.Spec.PostInitScript = scriptContents
- case tfv1alpha1.PodPrePlan:
- want.Spec.PrePlanScript = scriptContents
- case tfv1alpha1.PodPostPlan:
- want.Spec.PostPlanScript = scriptContents
- case tfv1alpha1.PodPreApply:
- want.Spec.PreApplyScript = scriptContents
- case tfv1alpha1.PodPostApply:
- want.Spec.PostApplyScript = scriptContents
- case tfv1alpha1.PodPreInitDelete:
- want.Spec.PreInitDeleteScript = scriptContents
- case tfv1alpha1.PodPostInitDelete:
- want.Spec.PostInitDeleteScript = scriptContents
- case tfv1alpha1.PodPrePlanDelete:
- want.Spec.PrePlanDeleteScript = scriptContents
- case tfv1alpha1.PodPostPlanDelete:
- want.Spec.PostPlanDeleteScript = scriptContents
- case tfv1alpha1.PodPreApplyDelete:
- want.Spec.PreApplyDeleteScript = scriptContents
- case tfv1alpha1.PodPostApplyDelete:
- want.Spec.PostApplyDeleteScript = scriptContents
- }
-}
diff --git a/projects/gencert/gencert-amd64.Dockerfile b/projects/gencert/gencert-amd64.Dockerfile
deleted file mode 100644
index cbcccd98bddb3e80158e78f0619f96c0a8d31fdd..0000000000000000000000000000000000000000
--- a/projects/gencert/gencert-amd64.Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM scratch
-COPY bin/gencert-amd64 /gencert
-ENTRYPOINT ["/gencert"]
diff --git a/projects/gencert/gencert-arm64v8.Dockerfile b/projects/gencert/gencert-arm64v8.Dockerfile
deleted file mode 100644
index 500d9f17faf13ce17fb82dfa7ea146c55f1c934c..0000000000000000000000000000000000000000
--- a/projects/gencert/gencert-arm64v8.Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM scratch
-COPY bin/gencert-arm64 /gencert
-ENTRYPOINT ["/gencert"]
diff --git a/projects/gencert/main.go b/projects/gencert/main.go
deleted file mode 100644
index 1a77873442e8e5014510f306536e4f13678744c1..0000000000000000000000000000000000000000
--- a/projects/gencert/main.go
+++ /dev/null
@@ -1,181 +0,0 @@
-package main
-
-import (
- "context"
- "crypto/x509"
- "encoding/pem"
- "fmt"
- "log"
- "os"
- "time"
-
- "github.com/isaaguilar/selfsigned"
- corev1 "k8s.io/api/core/v1"
- apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
- apiextensionsclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
- "k8s.io/apimachinery/pkg/api/errors"
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
- "k8s.io/client-go/kubernetes"
- "k8s.io/client-go/tools/clientcmd"
-)
-
-var path = "/conversion"
-
-var (
- namespace string
- serviceName string
- secretName string
- kubeconfig string
-)
-
-func init() {
- kubeconfig = os.Getenv("KUBECONFIG")
- namespace = os.Getenv("NAMESPACE")
- serviceName = os.Getenv("SERVICE")
- secretName = os.Getenv("SECRET")
- if namespace == "" {
- log.Fatal("NAMESPACE is required")
- }
- if serviceName == "" {
- log.Fatal("SERVICE is required")
- }
- if secretName == "" {
- log.Fatal("SECRET is required")
- }
-}
-
-// GetClientsOrDie returns 2 clients. Core k8s and api-extensions for CRDs.
-func GetClientsOrDie(kubeconfigPath string) (kubernetes.Interface, apiextensionsclient.Interface) {
- config, err := clientcmd.BuildConfigFromFlags("", kubeconfigPath)
- if err != nil {
- log.Fatal("Failed to get config for clientset")
- }
-
- return kubernetes.NewForConfigOrDie(config), apiextensionsclient.NewForConfigOrDie(config)
-}
-
-// isCertValid checks cert expiration and cert dns names
-func isCertValid(selfSignedCert selfsigned.SelfSignedCert, dnsNames []string) bool {
- roots := x509.NewCertPool()
- ok := roots.AppendCertsFromPEM(selfSignedCert.CACert)
- if !ok {
- log.Println("failed to parse root certificate")
- return false
- }
-
- block, _ := pem.Decode(selfSignedCert.TLSCert)
- if block == nil {
- log.Println("failed to parse certificate PEM")
- return false
- }
- cert, xerr := x509.ParseCertificate(block.Bytes)
- if xerr != nil {
- log.Println("failed to parse certificate: " + xerr.Error())
- return false
- }
-
- t := time.Now()
- opts := x509.VerifyOptions{
- CurrentTime: t.Add(24 * 30 * time.Hour), // 30 days
- DNSName: dnsNames[0],
- Roots: roots,
- }
-
- if _, err := cert.Verify(opts); err != nil {
- log.Println("failed to verify certificate: " + err.Error())
- return false
- }
- return true
-}
-
-func main() {
- ctx := context.TODO()
- dnsNames := []string{
- fmt.Sprintf("%s.%s.svc.cluster.local", serviceName, namespace),
- fmt.Sprintf("%s.%s.svc", serviceName, namespace),
- fmt.Sprintf("%s.%s", serviceName, namespace),
- }
- selfSignedCert := selfsigned.NewSelfSignedCertOrDie(dnsNames)
- clientset, apiclientset := GetClientsOrDie(kubeconfig)
- secretClient := clientset.CoreV1().Secrets(namespace)
-
- secret, err := secretClient.Get(ctx, secretName, metav1.GetOptions{})
- if err != nil {
- if errors.IsNotFound(err) {
- secret, err = secretClient.Create(
- ctx,
- &corev1.Secret{
- ObjectMeta: metav1.ObjectMeta{
- Name: secretName,
- Namespace: namespace,
- },
- Type: corev1.SecretTypeTLS,
- Data: map[string][]byte{
- "ca.crt": selfSignedCert.CACert,
- "tls.crt": selfSignedCert.TLSCert,
- "tls.key": selfSignedCert.TLSKey,
- },
- },
- metav1.CreateOptions{},
- )
- if err != nil {
- log.Panic(err)
- }
- log.Printf("TLS certs in secret/%s created\n", secret.Name)
- } else {
- log.Panic(err)
- }
- } else {
- if isCertValid(selfsigned.SelfSignedCert{CACert: secret.Data["ca.crt"], TLSCert: secret.Data["tls.crt"], TLSKey: secret.Data["tls.key"]}, dnsNames) {
- log.Printf("TLS certs in secret/%s are still valid", secret.Name)
- } else {
- secret.Data["ca.crt"] = selfSignedCert.CACert
- secret.Data["tls.crt"] = selfSignedCert.TLSCert
- secret.Data["tls.key"] = selfSignedCert.TLSKey
- secret, err = secretClient.Update(ctx, secret, metav1.UpdateOptions{})
- if err != nil {
- log.Panic(err)
- }
- log.Printf("TLS certs in secret/%s updated\n", secret.Name)
- }
- }
-
- crdClient := apiclientset.ApiextensionsV1().CustomResourceDefinitions()
- crd, err := crdClient.Get(ctx, "terraforms.tf.isaaguilar.com", metav1.GetOptions{})
- if err != nil {
- log.Panic(err)
- }
-
- if crd.Spec.Conversion != nil {
- if crd.Spec.Conversion.Webhook != nil {
- if crd.Spec.Conversion.Webhook.ClientConfig != nil {
- if string(crd.Spec.Conversion.Webhook.ClientConfig.CABundle) == string(secret.Data["ca.crt"]) {
- log.Println("CRD CABundle is up to date")
- return
- }
- }
- }
- }
-
- crd.Spec.PreserveUnknownFields = false
- crd.Spec.Conversion = &apiextensionsv1.CustomResourceConversion{
- Strategy: apiextensionsv1.WebhookConverter,
- Webhook: &apiextensionsv1.WebhookConversion{
- ConversionReviewVersions: []string{"v1"},
- ClientConfig: &apiextensionsv1.WebhookClientConfig{
- Service: &apiextensionsv1.ServiceReference{
- Namespace: namespace,
- Name: serviceName,
- Path: &path,
- },
- CABundle: secret.Data["ca.crt"],
- },
- },
- }
- _, err = crdClient.Update(ctx, crd, metav1.UpdateOptions{})
- if err != nil {
- log.Panic(err)
- }
- log.Println("CRD CABundle is updated")
-
-}
diff --git a/projects/gendocs/gendocs.go b/projects/gendocs/gendocs.go
index c100e678bf703d27826911ebbd29188a03ff4420..39ae92f81288e3c44f7ecd13292dd9efddd4995f 100644
--- a/projects/gendocs/gendocs.go
+++ b/projects/gendocs/gendocs.go
@@ -3,7 +3,7 @@ package main
import (
"flag"
- "github.com/isaaguilar/terraform-operator/pkg/apis/tf/v1alpha2"
+ "github.com/galleybytes/terraform-operator/pkg/apis/tf/v1beta1"
)
var (
@@ -18,5 +18,5 @@ func init() {
}
func main() {
- v1alpha2.Generate(templatefile, outputfile)
+ v1beta1.Generate(templatefile, outputfile)
}