Merge branch 'main' into feature/role

Author: vishesh92

.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

.github/workflows/acceptance.yml

@@ -97,7 +97,7 @@ jobs:
         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

.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_network_offering.go

@@ -54,6 +54,64 @@ func dataSourceCloudstackNetworkOffering() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"network_rate": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"network_mode": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"conserve_mode": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"enable": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"for_vpc": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"for_nsx": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"specify_vlan": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"specify_ip_ranges": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"specify_as_number": {
+				Type:     schema.TypeBool,
+				Computed: true,
+			},
+			"internet_protocol": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"routing_mode": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"max_connections": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"supported_services": {
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
+			"service_provider_list": {
+				Type:     schema.TypeMap,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 		},
 	}
 }
@@ -91,7 +149,12 @@ func datasourceCloudStackNetworkOfferingRead(d *schema.ResourceData, meta interf
 	}
 	log.Printf("[DEBUG] Selected network offerings: %s\n", networkOffering.Displaytext)
 
-	return networkOfferingDescriptionAttributes(d, networkOffering)
+	fullNetworkOffering, _, err := cs.NetworkOffering.GetNetworkOfferingByName(networkOffering.Name)
+	if err != nil {
+		return fmt.Errorf("Error retrieving full network offering details: %s", err)
+	}
+
+	return networkOfferingDescriptionAttributes(d, fullNetworkOffering)
 }
 
 func networkOfferingDescriptionAttributes(d *schema.ResourceData, networkOffering *cloudstack.NetworkOffering) error {
@@ -100,6 +163,50 @@ func networkOfferingDescriptionAttributes(d *schema.ResourceData, networkOfferin
 	d.Set("display_text", networkOffering.Displaytext)
 	d.Set("guest_ip_type", networkOffering.Guestiptype)
 	d.Set("traffic_type", networkOffering.Traffictype)
+	d.Set("network_rate", networkOffering.Networkrate)
+
+	// Only set if CloudStack supports these fields (4.20.0+)
+	if networkOffering.Networkmode != "" {
+		d.Set("network_mode", networkOffering.Networkmode)
+	}
+
+	d.Set("conserve_mode", networkOffering.Conservemode)
+	d.Set("enable", networkOffering.State == "Enabled")
+	d.Set("for_vpc", networkOffering.Forvpc)
+	d.Set("for_nsx", networkOffering.Fornsx)
+	d.Set("specify_vlan", networkOffering.Specifyvlan)
+	d.Set("specify_ip_ranges", networkOffering.Specifyipranges)
+	d.Set("specify_as_number", networkOffering.Specifyasnumber)
+	d.Set("internet_protocol", networkOffering.Internetprotocol)
+
+	// Only set if CloudStack supports this field (4.20.0+)
+	if networkOffering.Routingmode != "" {
+		d.Set("routing_mode", networkOffering.Routingmode)
+	}
+
+	if networkOffering.Maxconnections > 0 {
+		d.Set("max_connections", networkOffering.Maxconnections)
+	}
+
+	// Set supported services
+	if len(networkOffering.Service) > 0 {
+		services := make([]string, len(networkOffering.Service))
+		for i, service := range networkOffering.Service {
+			services[i] = service.Name
+		}
+		d.Set("supported_services", services)
+	}
+
+	// Set service provider list
+	if len(networkOffering.Service) > 0 {
+		serviceProviders := make(map[string]string)
+		for _, service := range networkOffering.Service {
+			if len(service.Provider) > 0 {
+				serviceProviders[service.Name] = service.Provider[0].Name
+			}
+		}
+		d.Set("service_provider_list", serviceProviders)
+	}
 
 	return nil
 }