vmware · slarimore02 · Nov 3, 2021
diff --git a/modules/terraform-aws-avi-controller-aws/.github/workflows/dual-site-gslb-test.yml b/modules/terraform-aws-avi-controller-aws/.github/workflows/dual-site-gslb-test.yml
@@ -0,0 +1,122 @@
+name: Avi - 2 Site GSLB Deployment
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  release:
+    types: [released]
+
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# These scenarios will be ran in parallel
+jobs:
+  # This workflow contains multiple jobs to test various scenarios
+  dual-site:
+    name: gslb (HA_${{ matrix.controller_ha }})
+    runs-on: ubuntu-latest
+    env:
+      site_type: "gslb"
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.TF_VAR_AWS_SECRET_KEY }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.TF_VAR_AWS_ACCESS_KEY }}
+      TF_VAR_aws_secret_key: ${{ secrets.TF_VAR_AWS_SECRET_KEY }}
+      TF_VAR_aws_access_key: ${{ secrets.TF_VAR_AWS_ACCESS_KEY }}
+      TF_VAR_create_iam: ${{ matrix.create_iam }}
+      TF_VAR_create_networking: ${{ matrix.create_networking }}
+      TF_VAR_custom_vpc_id_east: ${{ secrets.TF_VAR_CUSTOM_VPC_ID_EAST }}
+      TF_VAR_custom_subnet_ids_east: ${{ secrets.TF_VAR_CUSTOM_SUBNET_IDS_EAST }}
+      TF_VAR_avi_cidr_block_east: "10.252.0.0/16"
+      TF_VAR_dns_vs_settings_east: ${{ secrets.TF_VAR_DNS_VS_SETTINGS_EAST }}
+      TF_VAR_custom_vpc_id_west: ${{ secrets.TF_VAR_CUSTOM_VPC_ID_WEST }}
+      TF_VAR_custom_subnet_ids_west: ${{ secrets.TF_VAR_CUSTOM_SUBNET_IDS_WEST }}
+      TF_VAR_avi_cidr_block_west: "10.254.0.0/16"
+      TF_VAR_dns_vs_settings_west: ${{ secrets.TF_VAR_DNS_VS_SETTINGS_WEST }}
+      TF_VAR_controller_ha: ${{ matrix.controller_ha }}
+      TF_VAR_controller_password: ${{ secrets.TF_VAR_CONTROLLER_PASSWORD }}
+      TF_VAR_controller_public_address: ${{ matrix.controller_public_address }}
+      TF_VAR_private_key_path: "/home/runner/pkey"
+      TF_VAR_key_pair_name: ${{ secrets.TF_VAR_KEY_PAIR_NAME }}
+      TF_VAR_avi_version: ${{ matrix.avi_version }}
+      avi_version: ${{ matrix.avi_version }}
+    defaults:
+      run:
+        shell: bash
+        working-directory: test
+    strategy:
+      matrix:
+        include:
+          - avi_version: "20.1.6"
+            create_networking: false
+            controller_ha: false
+            controller_public_address: true
+            create_iam: false
+          - avi_version: "20.1.6"
+            create_networking: false
+            controller_ha: true
+            controller_public_address: true
+            create_iam: false
+          - avi_version: "21.1.1"
+            create_networking: false
+            controller_ha: false
+            controller_public_address: true
+            create_iam: false
+          - avi_version: "21.1.1"
+            create_networking: false
+            controller_ha: true
+            controller_public_address: true
+            create_iam: false
+      fail-fast: false
+
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: Setup Go environment
+        uses: actions/setup-go@v2.1.3
+        with:
+          go-version: 1.16
+
+      - name: Setup Env
+        run: |
+          go mod download
+          pipx inject ansible-core avisdk requests --include-deps --include-apps
+          pipx list
+          ansible-galaxy collection install vmware.alb
+          echo "$PKEY" > pkey_enc
+          cat pkey_enc | base64 -d > /home/runner/pkey
+          chmod 600 /home/runner/pkey
+        env:
+          PKEY: ${{ secrets.PKEY }}
+
+      - name: Create Infrastructure and run Go Tests
+        run: go test -v create_infra_test.go -tags=e2e -timeout 120m
+
+      - name: Run Ansible Playbook to verify Avi Controller Status
+        run: |
+          export name_prefix_east=$(cat ../examples/gslb/.test-data/TF_VAR_name_prefix_east.json)
+          export name_prefix_west=$(cat ../examples/gslb/.test-data/TF_VAR_name_prefix_west.json)
+          export controller_west_ip=$(terraform -chdir="../examples/gslb" output -no-color  -json | jq .controllers_west.value[0].public_ip_address)
+          export controller_east_ip=$(terraform -chdir="../examples/gslb" output -no-color  -json | jq .controllers_east.value[0].public_ip_address)
+          ansible-playbook ansible_test.yml -e password=$TF_VAR_controller_password -e controller_ip=$controller_east_ip -e avi_version=$avi_version -e name_prefix=$name_prefix_east -e controller_ha=$TF_VAR_controller_ha
+          ansible-playbook ansible_test.yml -e password=$TF_VAR_controller_password -e controller_ip=$controller_west_ip -e verify_gslb=true -e avi_version=$avi_version -e name_prefix=$name_prefix_west -e controller_ha=$TF_VAR_controller_ha
+
+      - name: Cleanup Avi Created Infra
+        if: ${{ always() }}
+        run: |
+          export controller_west_ip=$(terraform -chdir="../examples/gslb" output -no-color  -json | jq .controllers_west.value[0].public_ip_address)
+          export controller_east_ip=$(terraform -chdir="../examples/gslb" output -no-color  -json | jq .controllers_east.value[0].public_ip_address)
+          ansible-playbook ansible_avi_cleanup.yml -e password=$TF_VAR_controller_password -e controller_ip=$controller_east_ip -e avi_version=$TF_VAR_avi_version
+          ansible-playbook ansible_avi_cleanup.yml -e password=$TF_VAR_controller_password -e controller_ip=$controller_west_ip -e avi_version=$TF_VAR_avi_version
+
+
+      - name: Run Terraform Destroy
+        if: ${{ always() }}
+        run: |
+          go test -v destroy_infra_test.go -timeout 30m
diff --git a/modules/terraform-aws-avi-controller-aws/.github/workflows/single-site-test.yml b/modules/terraform-aws-avi-controller-aws/.github/workflows/single-site-test.yml
@@ -0,0 +1,115 @@
+name: Avi - Single Site Deployment
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+  release:
+    types: [released]
+
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# These scenarios will be ran in parallel
+jobs:
+  # This workflow contains multiple jobs to test various scenarios
+  single-site:
+    name: 1-site (Network_${{ matrix.create_networking }},HA_${{ matrix.controller_ha }})
+    runs-on: ubuntu-latest
+    env:
+      site_type: "single-site"
+      AWS_SECRET_ACCESS_KEY: ${{ secrets.TF_VAR_AWS_SECRET_KEY }}
+      AWS_ACCESS_KEY_ID: ${{ secrets.TF_VAR_AWS_ACCESS_KEY }}
+      TF_VAR_aws_secret_key: ${{ secrets.TF_VAR_AWS_SECRET_KEY }}
+      TF_VAR_aws_access_key: ${{ secrets.TF_VAR_AWS_ACCESS_KEY }}
+      TF_VAR_create_iam: ${{ matrix.create_iam }}
+      TF_VAR_create_networking: ${{ matrix.create_networking }}
+      TF_VAR_controller_password: ${{ secrets.TF_VAR_CONTROLLER_PASSWORD }}
+      TF_VAR_custom_vpc_id: ${{ secrets.TF_VAR_CUSTOM_VPC_ID_WEST }}
+      TF_VAR_custom_subnet_ids: ${{ secrets.TF_VAR_CUSTOM_SUBNET_IDS_WEST }}
+      TF_VAR_avi_cidr_block: "10.254.0.0/16"
+      TF_VAR_dns_vs_settings: ${{ secrets.TF_VAR_DNS_VS_SETTINGS_WEST }}
+      TF_VAR_controller_ha: ${{ matrix.controller_ha }}
+      TF_VAR_controller_public_address: ${{ matrix.controller_public_address }}
+      TF_VAR_configure_dns_profile: "true"
+      TF_VAR_dns_service_domain: "aviterraform.local"
+      TF_VAR_configure_dns_vs: "true"
+      TF_VAR_private_key_path: "/home/runner/pkey"
+      TF_VAR_key_pair_name: ${{ secrets.TF_VAR_KEY_PAIR_NAME }}
+      TF_VAR_avi_version: ${{ matrix.avi_version }}
+      avi_version: ${{ matrix.avi_version }}
+    defaults:
+      run:
+        shell: bash
+        working-directory: test
+    strategy:
+      matrix:
+        include:
+          - avi_version: "20.1.6"
+            create_networking: false
+            controller_ha: false
+            controller_public_address: true
+            create_iam: false
+          - avi_version: "20.1.6"
+            create_networking: false
+            controller_ha: true
+            controller_public_address: true
+            create_iam: false
+          - avi_version: "21.1.1"
+            create_networking: false
+            controller_ha: false
+            controller_public_address: true
+            create_iam: false
+          - avi_version: "21.1.1"
+            create_networking: false
+            controller_ha: true
+            controller_public_address: true
+            create_iam: false
+      fail-fast: false
+
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v2
+
+      - name: Setup Go environment
+        uses: actions/setup-go@v2.1.3
+        with:
+          go-version: 1.16
+
+      - name: Setup Env
+        run: |
+          go mod download
+          pipx inject ansible-core avisdk requests --include-deps --include-apps
+          pipx list
+          ansible-galaxy collection install vmware.alb
+          echo "$PKEY" > pkey_enc
+          cat pkey_enc | base64 -d > /home/runner/pkey
+          chmod 600 /home/runner/pkey
+        env:
+          PKEY: ${{ secrets.PKEY }}
+
+      - name: Create Infrastructure and run Go Tests
+        run: go test -v create_infra_test.go -tags=e2e -timeout 120m
+
+      - name: Run Ansible Playbook to verify Avi Controller Status
+        run: |
+          export name_prefix=$(cat ../examples/single-site/.test-data/TF_VAR_name_prefix.json)
+          export controller_ip=$(terraform -chdir="../examples/single-site" output -no-color  -json | jq .controllers.value[0].public_ip_address)
+          ansible-playbook ansible_test.yml -e password=$TF_VAR_controller_password -e controller_ip=$controller_ip -e avi_version=$avi_version -e name_prefix=$name_prefix -e controller_ha=$TF_VAR_controller_ha
+
+      - name: Cleanup Avi Created Infra
+        if: ${{ always() }}
+        run: |
+          export controller_ip=$(terraform -chdir="../examples/single-site" output -no-color  -json | jq .controllers.value[0].public_ip_address)
+          ansible-playbook ansible_avi_cleanup.yml -e password=$TF_VAR_controller_password -e controller_ip=$controller_ip -e avi_version=$avi_version
+
+      - name: Run Terraform Destroy
+        if: ${{ always() }}
+        run: |
+          go test -v destroy_infra_test.go -timeout 30m
diff --git a/modules/terraform-aws-avi-controller-aws/.gitignore b/modules/terraform-aws-avi-controller-aws/.gitignore
@@ -0,0 +1,13 @@
+# Local .terraform directories
+**/.terraform/*
+**/*.tar.gz
+.terraform
+terraform.tfstate
+*.tfstate*
+terraform.tfvars
+.terraform.lock.hcl
+terraform.tfvars.*
+**/examples/*/.terraform/*
+**/examples/*/terraform.tfvars
+**/examples/*/terraform.lock.hcl
+**/examples/*/.test-data
diff --git a/modules/terraform-aws-avi-controller-aws/.pre-commit-config.yaml b/modules/terraform-aws-avi-controller-aws/.pre-commit-config.yaml
@@ -0,0 +1,26 @@
+repos:
+  - repo: git://github.com/antonbabenko/pre-commit-terraform
+    rev: v1.44.0
+    hooks:
+      - id: terraform_fmt
+      - id: terraform_validate
+      - id: terraform_docs
+      - id: terraform_tflint
+        args:
+          - '--args=--only=terraform_deprecated_interpolation'
+          - '--args=--only=terraform_deprecated_index'
+          - '--args=--only=terraform_unused_declarations'
+          - '--args=--only=terraform_comment_syntax'
+          - '--args=--only=terraform_documented_outputs'
+          - '--args=--only=terraform_documented_variables'
+          - '--args=--only=terraform_typed_variables'
+          - '--args=--only=terraform_module_pinned_source'
+          - '--args=--only=terraform_naming_convention'
+          - '--args=--only=terraform_required_version'
+          - '--args=--only=terraform_required_providers'
+          - '--args=--only=terraform_standard_module_structure'
+          - '--args=--only=terraform_workspace_remote'
+  - repo: git://github.com/pre-commit/pre-commit-hooks
+    rev: v3.3.0
+    hooks:
+      - id: check-merge-conflict