Merge branch 'main' into offerings

Author: CodeBleu

.asf.yaml

@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
 github:
   description: "CloudStack Terraform Provider"
   homepage: https://cloudstack.apache.org

…ub/workflows/setup-cloudstack/action.yml …thub/actions/setup-cloudstack/action.yml.github/workflows/setup-cloudstack/action.yml renamed to .github/actions/setup-cloudstack/action.yml .github/workflows/setup-cloudstack/action.yml renamed to .github/actions/setup-cloudstack/action.yml

@@ -49,33 +49,57 @@ runs:
             ((T+=1))
             sleep 30
         done
+
+        # After loop, check if Cloudstack is up
+        if ! curl -sfSL http://localhost:8080 --output /dev/null; then
+          echo "Cloudstack did not become ready in time"
+          curl -v http://localhost:8080 || true
+          exit 22
+        fi
     - name: Setting up Cloudstack
       id: setup-cloudstack
       shell: bash
       run: |
-        docker exec $(docker container ls --format=json -l | jq -r .ID) python /root/tools/marvin/marvin/deployDataCenter.py -i /root/setup/dev/advanced.cfg
-        curl -sf --location "${CLOUDSTACK_API_URL}" \
-            --header 'Content-Type: application/x-www-form-urlencoded' \
-            --data-urlencode 'command=login' \
-            --data-urlencode 'username=admin' \
-            --data-urlencode 'password=password' \
-            --data-urlencode 'response=json' \
-            --data-urlencode 'domain=/' -j -c cookies.txt --output /dev/null
-
-        CLOUDSTACK_USER_ID=$(curl -fs "${CLOUDSTACK_API_URL}?command=listUsers&response=json" -b cookies.txt | jq -r '.listusersresponse.user[0].id')
-        CLOUDSTACK_API_KEY=$(curl -s "${CLOUDSTACK_API_URL}?command=getUserKeys&id=${CLOUDSTACK_USER_ID}&response=json" -b cookies.txt | jq -r '.getuserkeysresponse.userkeys.apikey')
-        CLOUDSTACK_SECRET_KEY=$(curl -fs "${CLOUDSTACK_API_URL}?command=getUserKeys&id=${CLOUDSTACK_USER_ID}&response=json" -b cookies.txt | jq -r '.getuserkeysresponse.userkeys.secretkey')
+
+        set -euo pipefail
+
+        echo "Deploying Data Center..."
+        docker exec $(docker container ls --format=json -l | jq -r .ID) \
+          python /root/tools/marvin/marvin/deployDataCenter.py -i /root/setup/dev/advanced.cfg
+
+        # Get the container ID of the running simulator
+        CONTAINER_ID=$(docker ps --filter "ancestor=apache/cloudstack-simulator:${{ matrix.cloudstack-version }}" --format "{{.ID}}" | head -n1)
+
+        # Install CloudMonkey
+        docker exec $CONTAINER_ID bash -c "curl -sfSL https://github.com/apache/cloudstack-cloudmonkey/releases/download/6.4.0/cmk.linux.x86-64 -o /usr/local/bin/cmk && chmod +x /usr/local/bin/cmk"
+
+        # Write the CloudMonkey config file with a profile using user/pass
+        docker exec $CONTAINER_ID mkdir -p /root/.cmk
+        docker exec $CONTAINER_ID bash -c "printf '[core]\nprofile = localcloud\n\n[localcloud]\nurl = http://localhost:8080/client/api\nusername = admin\npassword = password\ndomain = /\napikey =\nsecretkey =\ntimeout = 3600\n' > /root/.cmk/config"
+
+
+        # Use CloudMonkey with the profile to list users and extract API key/secret key
+        docker exec $CONTAINER_ID cmk -p localcloud list users --output json > users.json
+
+        # Generate API keys
+        docker exec $CONTAINER_ID cmk -p localcloud registeruserKeys id=$(jq -r '.user[0].id' users.json) > api.json
+
+        # Extract the first user's keys (assuming admin is first)
+        CLOUDSTACK_API_KEY=$(jq -r '.userkeys.apikey' api.json)
+        CLOUDSTACK_SECRET_KEY=$(jq -r '.userkeys.secretkey' api.json)
+        CLOUDSTACK_USER_ID=$(jq -r '.user[0].id' users.json)
 
         echo "::add-mask::$CLOUDSTACK_API_KEY"
         echo "::add-mask::$CLOUDSTACK_SECRET_KEY"
 
         echo "user_id=$CLOUDSTACK_USER_ID" >> $GITHUB_OUTPUT
         echo "api_key=$CLOUDSTACK_API_KEY" >> $GITHUB_OUTPUT
         echo "secret_key=$CLOUDSTACK_SECRET_KEY" >> $GITHUB_OUTPUT
+
     - name: Install CMK
       shell: bash
       run: |
-        curl -sfL https://github.com/apache/cloudstack-cloudmonkey/releases/download/6.3.0/cmk.linux.x86-64 -o /usr/local/bin/cmk
+        curl -sfSL https://github.com/apache/cloudstack-cloudmonkey/releases/download/6.4.0/cmk.linux.x86-64 -o /usr/local/bin/cmk
         chmod +x /usr/local/bin/cmk
     - name: Create extra resources
       shell: bash

.github/workflows/acceptance.yml

@@ -30,7 +30,7 @@ permissions:
 
 env:
   CLOUDSTACK_API_URL: http://localhost:8080/client/api
-  CLOUDSTACK_VERSIONS: "['4.18.2.1', '4.19.0.2']"
+  CLOUDSTACK_VERSIONS: "['4.19.0.1', '4.19.1.3', '4.19.2.0', '4.19.3.0', '4.20.1.0']"
 
 jobs:
   prepare-matrix:
@@ -54,7 +54,7 @@ jobs:
         with:
           go-version-file: 'go.mod'
       - name: Configure Cloudstack v${{ matrix.cloudstack-version }}
-        uses: ./.github/workflows/setup-cloudstack
+        uses: ./.github/actions/setup-cloudstack
         id: setup-cloudstack
         with:
           cloudstack-version: ${{ matrix.cloudstack-version }}
@@ -78,8 +78,8 @@ jobs:
       fail-fast: false
       matrix:
         terraform-version:
-          - '1.8.*'
-          - '1.9.*'
+          - '1.11.*'
+          - '1.12.*'
         cloudstack-version: ${{ fromJson(needs.prepare-matrix.outputs.cloudstack-versions) }}
 
   acceptance-opentofu:
@@ -93,11 +93,11 @@ jobs:
         with:
           go-version-file: 'go.mod'
       - name: Configure Cloudstack v${{ matrix.cloudstack-version }}
-        uses: ./.github/workflows/setup-cloudstack
+        uses: ./.github/actions/setup-cloudstack
         id: setup-cloudstack
         with:
           cloudstack-version: ${{ matrix.cloudstack-version }}
-      - uses: opentofu/setup-opentofu@v1
+      - uses: opentofu/setup-opentofu@000eeb8522f0572907c393e8151076c205fdba1b # v1.0.6
         with:
           tofu_version: ${{ matrix.opentofu-version }}
       - name: Run acceptance test
@@ -116,8 +116,8 @@ jobs:
       fail-fast: false
       matrix:
         opentofu-version:
-          - '1.6.*'
-          - '1.7.*'
+          - '1.8.*'
+          - '1.9.*'
         cloudstack-version: ${{ fromJson(needs.prepare-matrix.outputs.cloudstack-versions) }}
 
   all-jobs-passed: # Will succeed if it is skipped

.github/workflows/rat.yaml

@@ -0,0 +1,36 @@
+name: RAT Check
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  rat:
+    name: Apache RAT Check
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Download Apache RAT
+        run: |
+          curl -L -O https://downloads.apache.org/creadur/apache-rat-0.16.1/apache-rat-0.16.1-bin.tar.gz
+          tar -xzf apache-rat-0.16.1-bin.tar.gz
+
+      - name: Run RAT
+        run: |
+          java -jar apache-rat-0.16.1/apache-rat-0.16.1.jar -d . -E .rat-excludes > rat-report.txt
+          cat rat-report.txt
+          # Fail if unapproved licenses are found
+          grep -qe '^0 Unknown Licenses' rat-report.txt && exit 0 || exit 1

.rat-excludes

@@ -0,0 +1,9 @@
+CHANGELOG.md
+CONTRIBUTING.md
+go.sum
+rat-report.txt
+apache-rat-0.16.1
+.gitignore
+.rat-excludes
+.terraform-registry
+website

GNUmakefile

@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+
 TEST?=$$(go list ./... | grep -v 'vendor')
 GOFMT_FILES?=$$(find . -name '*.go' | grep -v vendor)
 WEBSITE_REPO=github.com/hashicorp/terraform-website

README.md

@@ -128,13 +128,13 @@ docker pull apache/cloudstack-simulator
 
 or pull it with a particular build tag
 
-docker pull apache/cloudstack-simulator:4.19.0.0
+docker pull apache/cloudstack-simulator:4.20.1.0
 
 docker run --name simulator -p 8080:5050 -d apache/cloudstack-simulator
 
 or
 
-docker run --name simulator -p 8080:5050 -d apache/cloudstack-simulator:4.19.0.0
+docker run --name simulator -p 8080:5050 -d apache/cloudstack-simulator:4.20.1.0
 ```
 
 When Docker started the container you can go to http://localhost:8080/client and login to the CloudStack UI as user `admin` with password `password`. It can take a few minutes for the container is fully ready, so you probably need to wait and refresh the page for a few minutes before the login page is shown.
@@ -159,6 +159,12 @@ In order for all the tests to pass, you will need to create a new (empty) projec
 $ make testacc
 ```
 
+To execute specific test:
+
+```sh
+$ make testacc TESTARGS='-run ^TestAccCloudStackNetworkACLRule_update$'
+```
+
 ## Sample Terraform configuration when testing locally
 
 Below is an example configuration to initialize provider and create a Virtual Machine instance

cloudstack/data_source_cloudstack_vpc.go

@@ -66,6 +66,7 @@ func dataSourceCloudstackVPC() *schema.Resource {
 			"project": {
 				Type:     schema.TypeString,
 				Computed: true,
+				Optional: true,
 			},
 
 			"zone_name": {
@@ -81,6 +82,12 @@ func dataSourceCloudstackVPC() *schema.Resource {
 func datasourceCloudStackVPCRead(d *schema.ResourceData, meta interface{}) error {
 	cs := meta.(*cloudstack.CloudStackClient)
 	p := cs.VPC.NewListVPCsParams()
+
+	// If there is a project supplied, we retrieve and set the project id
+	if err := setProjectid(p, cs, d); err != nil {
+		return err
+	}
+
 	csVPCs, err := cs.VPC.ListVPCs(p)
 
 	if err != nil {

cloudstack/provider.go

@@ -96,6 +96,7 @@ func Provider() *schema.Provider {
 			"cloudstack_affinity_group":       resourceCloudStackAffinityGroup(),
 			"cloudstack_attach_volume":        resourceCloudStackAttachVolume(),
 			"cloudstack_autoscale_vm_profile": resourceCloudStackAutoScaleVMProfile(),
+			"cloudstack_configuration":        resourceCloudStackConfiguration(),
 			"cloudstack_disk":                 resourceCloudStackDisk(),
 			"cloudstack_egress_firewall":      resourceCloudStackEgressFirewall(),
 			"cloudstack_firewall":             resourceCloudStackFirewall(),

cloudstack/provider_v6.go

@@ -1,3 +1,20 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you 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 cloudstack
 
 import (