Update Terraform EE

terraform_ee/README.md

@@ -1,5 +1,5 @@
-# aws_ee
-definition file for aws_ee
+# terraform_ee
+definition file for terraform_ee
 
 ## Requirements:
 
@@ -19,7 +19,7 @@ To build->
 
 ```
 $ podman login quay.io
-Username: seanc@redhat.com
+Username: user@example.com
 Password:
 Login Succeeded!
 $
@@ -32,7 +32,7 @@ localhost/ansible-execution-env
 <none>                                                                             <none>      b1b66b45526c  13 minutes ago  945 MB
 <none>                                                                             <none>      e32d30b2f115  16 minutes ago  938 MB
 quay.io/ansible/ansible-builder                                                    latest      8e8cbed25d34  22 hours ago    538 MB
-registry.redhat.io/ansible-automation-platform-20-early-access/ee-supported-rhel8  2.0.0       85ca2003a842  2 months ago    920 MB
+registry.redhat.io/ansible-automation-platform-25/ee-supported-rhel8  latest       85ca2003a842  2 months ago    920 MB
 ````
 
 Make sure you have the destination made on your registry... and that you have write access or you will get an error.  For example on quay I needed to make this public because my hosting plan did not let me have a private registry, so it failed.

terraform_ee/bindep.txt

@@ -1,2 +1,6 @@
 unzip
 dnf
+systemd-devel [compile platform:rhel-8]
+python3.11-devel [compile platform:rhel-8]
+pkgconf-pkg-config [compile platform:rhel-8]
+gcc [compile platform:rhel-8]

terraform_ee/execution-environment.yml

@@ -1,8 +1,8 @@
 ---
-version: 1
-
-build_arg_defaults:
-  EE_BASE_IMAGE: 'registry.redhat.io/ansible-automation-platform-22/ee-supported-rhel8'
+version: 3
+images:
+  base_image:
+    name: registry.redhat.io/ansible-automation-platform-25/ee-minimal-rhel8:latest
 
 
 dependencies:
@@ -11,12 +11,23 @@ dependencies:
   system: bindep.txt
 
 additional_build_steps:
+  prepend_base:
+    - RUN $PYCMD -m pip install --upgrade pip setuptools 
+  prepend_galaxy:
+    # Add custom ansible.cfg which defines collection install sources
+    - ADD _build/configs/ansible.cfg /etc/ansible/ansible.cfg
+    # AH_TOKEN is passed into the build command using a --build-arg
+    # accept this as an ARG during this stage to reference later
+    - ARG AH_TOKEN
+    # Use the above ARG to define an environment variable holding
+    # the token for resolving private collections
+    - ENV ANSIBLE_GALAXY_SERVER_AUTOMATION_HUB_TOKEN=$AH_TOKEN
   append:
     - RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "/awscliv2.zip"
     - RUN unzip /awscliv2.zip -d /aws
     - RUN /aws/aws/install
     - RUN curl "https://s3.amazonaws.com/session-manager-downloads/plugin/latest/linux_64bit/session-manager-plugin.rpm" -o "/session-manager-plugin.rpm"
     - RUN dnf install -y /session-manager-plugin.rpm
-    - RUN curl "https://releases.hashicorp.com/terraform/1.4.6/terraform_1.4.6_linux_386.zip" -o "/terraform.zip"
+    - RUN curl "https://releases.hashicorp.com/terraform/1.10.3/terraform_1.10.3_linux_386.zip" -o "/terraform.zip"
     - RUN unzip /terraform.zip -d /terraform
     - RUN mv /terraform/terraform /bin

terraform_ee/requirements.txt

@@ -1,3 +1,10 @@
 pysnow
 requests
 netaddr
+#
+# When updating the minimal requirements please also update
+# - tests/unit/constraints.txt
+# - tests/integration/constraints.txt
+# - tests/integration/targets/setup_botocore_pip
+botocore>=1.31.0
+boto3>=1.28.0

terraform_ee/requirements.yml

@@ -1,9 +1,12 @@
 ---
 collections:
-  - name: servicenow.itsm
   - name: amazon.aws
-  - name: awx.awx
   - name: amazon.cloud
   - name: community.aws
+  - name: ansible.controller
+  - name: ansible.platform
+  - name: ansible.posix
+  - name: awx.awx
   - name: cloud.terraform
-    version: 1.0.0
+    version: 3.0.0
+  - name: google.cloud