[BUGFIX] - Revision Variables

.github/workflows/e2e.yaml

@@ -49,7 +49,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Build
-        uses: docker/build-push-action@v4.1.0
+        uses: docker/build-push-action@v4.1.1
         with:
           context: .
           file: images/Dockerfile.controller
@@ -71,7 +71,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Build
-        uses: docker/build-push-action@v4.1.0
+        uses: docker/build-push-action@v4.1.1
         with:
           context: .
           file: images/Dockerfile.executor

.github/workflows/images.yaml

@@ -42,7 +42,7 @@ jobs:
           fi
       - name: Docker Metadata
         id: docker_meta
-        uses: docker/metadata-action@v4.5.0
+        uses: docker/metadata-action@v4.6.0
         with:
           images: |
             ghcr.io/appvia/terranetes-${{ matrix.image }}
@@ -51,7 +51,7 @@ jobs:
           tags: |
             type=raw,value=${{ steps.get_image_tag.outputs.image_tag }}
       - name: Build & Push
-        uses: docker/build-push-action@v4.1.0
+        uses: docker/build-push-action@v4.1.1
         with:
           build-args: VERSION=${{ steps.get_image_tag.outputs.image_tag }}
           context: .

.github/workflows/release.yaml

@@ -13,11 +13,11 @@ jobs:
     with:
       cloud: aws
 
-#  e2e-azure:
-#    uses: ./.github/workflows/e2e.yaml
-#    secrets: inherit
-#    with:
-#      cloud: azurerm
+  e2e-azure:
+    uses: ./.github/workflows/e2e.yaml
+    secrets: inherit
+    with:
+      cloud: azurerm
 
   e2e-google:
     uses: ./.github/workflows/e2e.yaml
@@ -29,14 +29,14 @@ jobs:
     needs:
       - e2e-aws
       - e2e-google
-#      - e2e-azure
+      - e2e-azure
     uses: ./.github/workflows/images.yaml
     secrets: inherit
 
   release:
     needs:
       - e2e-aws
-#      - e2e-azure
+      - e2e-azure
       - e2e-google
     name: Github Release
     runs-on: ubuntu-latest

.github/workflows/versions.yaml

@@ -48,6 +48,9 @@ jobs:
           if [[ "${{ matrix.image }}" == "infracost/infracost" ]]; then
             export IMAGE="${{ matrix.image }}:ci-${VERSION##v}"
           fi
+          if [[ "${{ matrix.image }}" == "bridgecrew/checkov" ]]; then
+            export IMAGE="${{ matrix.image }}:${VERSION}-pyston
+          fi
 
           yq e '.${{ matrix.value }} = strenv(IMAGE)' -i charts/terranetes-controller/values.yaml
       - name: Raise Pull Request

.gitignore

@@ -21,6 +21,8 @@ out
 me.yml
 me.yaml
 tmp/
+TODO
+TODO.md
 
 # Terraform Related
 terraform.tfstate

.golangci.yml

@@ -18,6 +18,7 @@ linters:
     - errname
     - errorlint
     - exportloopref
+    - goconst
     - gocyclo
     - gosec
     - gosimple
@@ -42,7 +43,6 @@ linters-settings:
             desc: deprecated in go1.16
 
   gosimple:
-    go: "1.17"
     checks:
       - all
 
@@ -53,12 +53,10 @@ linters-settings:
       - shadow
 
   staticcheck:
-    go: "1.17"
     checks:
       - all
 
   stylecheck:
-    go: "1.17"
     checks:
       - all
       - -ST1003

Makefile

@@ -49,6 +49,7 @@ apis: golang
 	@$(MAKE) controller-gen
 	@$(MAKE) register-gen
 	@$(MAKE) schema-gen
+	@$(MAKE) mock-gen
 	@$(MAKE) gofmt
 
 check-apis: apis
@@ -62,6 +63,11 @@ check-api-sync:
 		exit 1; \
 	fi
 
+mock-gen:
+	@echo "--> Generating Mocks"
+	@go run github.com/golang/mock/mockgen -package mocks github.com/aws/aws-sdk-go/service/ec2/ec2iface EC2API > pkg/utils/preload/eks/mocks/ec2_zz.go
+	@go run github.com/golang/mock/mockgen -package mocks github.com/aws/aws-sdk-go/service/eks/eksiface EKSAPI > pkg/utils/preload/eks/mocks/eks_zz.go
+
 controller-gen:
 	@echo "--> Generating deepcopies, CRDs and webhooks"
 	@rm -rf charts/terranetes-controller/crds
@@ -248,6 +254,10 @@ check: test
 
 ### UTILITIES ###
 
+develop-environment:
+	@echo "--> Creating a development environment"
+	@hack/create-development.sh
+
 trigger-aws-e2e:
 	@echo "--> Triggering the e2e tests on ${GIT_BRANCH} branch (AWS)"
 	@gh workflow run e2e.yaml --ref ${GIT_BRANCH} -f cloud=aws -f use_helm=false -f version=ci

charts/terranetes-controller/crds/terraform.appvia.io_configurations.yaml

@@ -17,9 +17,16 @@ spec:
         - jsonPath: .spec.module
           name: Module
           type: string
+        - jsonPath: .spec.plan.name
+          name: Plan
+          priority: 1
+          type: string
         - jsonPath: .spec.writeConnectionSecretToRef.name
           name: Secret
           type: string
+        - jsonPath: .spec.enableDriftDetection
+          name: Drift Detection
+          type: boolean
         - jsonPath: .status.costs.monthly
           name: Estimated
           type: string
@@ -65,6 +72,19 @@ spec:
                 module:
                   description: Module is the URL to the source of the terraform module. The format of the URL is a direct implementation of terraform's module reference. Please see the following repository for more details https://github.com/hashicorp/go-getter
                   type: string
+                plan:
+                  description: Plan is an optional reference to a plan this configuration is associated with. If not set and a policy exists to enforce a plan, the configuration will be rejected.
+                  properties:
+                    name:
+                      description: Name is the name of the plan this configuration is associated with
+                      type: string
+                    revision:
+                      description: Revision is the revision of the plan this configuration is associated with
+                      type: string
+                  required:
+                    - name
+                    - revision
+                  type: object
                 providerRef:
                   description: ProviderRef is the reference to the provider which should be used to execute this configuration.
                   properties:
@@ -92,7 +112,7 @@ spec:
                         description: Key is the key in the secret which we should used for the value
                         type: string
                       name:
-                        description: Name is the name which we use when injecting the value into the terraform code i.e. the secret maye contain data.DB_HOST but you call this database_hostname. Note, for backwards compatiability if no name is provided, we using the key at the name
+                        description: Name is the name which we use when injecting the value into the terraform code i.e. the secret may contain data.DB_HOST but you call this database_hostname. Note, for backwards compatiability if no name is provided, we using the key at the name
                         type: string
                       optional:
                         description: Optional indicates the secret can be optional, i.e if the secret does not exist, or the key is not contained in the secret, we ignore the error
@@ -124,7 +144,6 @@ spec:
                   type: object
               required:
                 - module
-                - providerRef
               type: object
             status:
               description: ConfigurationStatus defines the observed state of a terraform

charts/terranetes-controller/crds/terraform.appvia.io_plans.yaml

@@ -0,0 +1,157 @@
+apiVersion: apiextensions.k8s.io/v1
+kind: CustomResourceDefinition
+metadata:
+  annotations:
+    controller-gen.kubebuilder.io/version: v0.11.4
+  name: plans.terraform.appvia.io
+spec:
+  group: terraform.appvia.io
+  names:
+    categories:
+      - terraform
+    kind: Plan
+    listKind: PlanList
+    plural: plans
+    singular: plan
+  scope: Cluster
+  versions:
+    - additionalPrinterColumns:
+        - jsonPath: .status.latest.revision
+          name: Latest
+          type: string
+        - jsonPath: .metadata.creationTimestamp
+          name: Age
+          type: date
+      name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: Plan is the schema for the plan type
+          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: PlanSpec defines the desired state for a context
+              properties:
+                revisions:
+                  description: Revisions is a collection of revision associated with this plan
+                  items:
+                    description: PlanRevision is a reference to a revision of a plan existing in the system
+                    properties:
+                      name:
+                        description: Name is the name of the revision containing the configuration
+                        type: string
+                      revision:
+                        description: Revision is the version of the revision
+                        type: string
+                    required:
+                      - name
+                      - revision
+                    type: object
+                  type: array
+              type: object
+            status:
+              description: PlanStatus defines the observed state of a terraform
+              properties:
+                conditions:
+                  description: Conditions represents the observations of the resource's current state.
+                  items:
+                    description: Condition is the current observed condition of some aspect of a resource
+                    properties:
+                      detail:
+                        description: Detail is any additional human-readable detail to understand this condition, for example, the full underlying error which caused an issue
+                        type: string
+                      lastTransitionTime:
+                        description: LastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
+                        format: date-time
+                        type: string
+                      message:
+                        description: Message is a human readable message indicating details about the transition. This may be an empty string.
+                        maxLength: 32768
+                        type: string
+                      name:
+                        description: Name is a human-readable name for this condition.
+                        minLength: 1
+                        type: string
+                      observedGeneration:
+                        description: ObservedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
+                        format: int64
+                        minimum: 0
+                        type: integer
+                      reason:
+                        description: Reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
+                        maxLength: 1024
+                        minLength: 1
+                        pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
+                        type: string
+                      status:
+                        description: Status of the condition, one of True, False, Unknown.
+                        enum:
+                          - "True"
+                          - "False"
+                          - Unknown
+                        type: string
+                      type:
+                        description: Type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                        maxLength: 316
+                        pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
+                        type: string
+                    required:
+                      - name
+                      - reason
+                      - status
+                      - type
+                    type: object
+                  type: array
+                  x-kubernetes-list-map-keys:
+                    - type
+                  x-kubernetes-list-type: map
+                lastReconcile:
+                  description: LastReconcile describes the generation and time of the last reconciliation
+                  properties:
+                    generation:
+                      description: Generation is the generation reconciled on the last reconciliation
+                      format: int64
+                      type: integer
+                    time:
+                      description: Time is the last time the resource was reconciled
+                      format: date-time
+                      type: string
+                  type: object
+                lastSuccess:
+                  description: LastSuccess descibes the generation and time of the last reconciliation which resulted in a Success status
+                  properties:
+                    generation:
+                      description: Generation is the generation reconciled on the last reconciliation
+                      format: int64
+                      type: integer
+                    time:
+                      description: Time is the last time the resource was reconciled
+                      format: date-time
+                      type: string
+                  type: object
+                latest:
+                  description: Latest is the latest revision from this plan
+                  properties:
+                    name:
+                      description: Name is the name of the revision containing the configuration
+                      type: string
+                    revision:
+                      description: Revision is the version of the revision
+                      type: string
+                  required:
+                    - name
+                    - revision
+                  type: object
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
+  preserveUnknownFields: false