DXE-3746 Merge pull request #545 from akamai/release/v6.1.0

Release/v6.1.0
akamai · Apr 23, 2024 · 8c0d28a · 8c0d28a
2 parents 7b3478a + 32ef5fb
commit 8c0d28a
Show file tree

Hide file tree

Showing 17 changed files with 558 additions and 83 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # RELEASE NOTES
 
+## 6.1.0 (Apr 23, 2024)
+
+#### FEATURES/ENHANCEMENTS:
+
+* DNS
+  * Added second mode to `akamai_dns_record` resource where it is possible to provide individual values for priority, weight and port to **every** `SRV` target.
+    In such case it is not allowed to provide values for resource level fields `priority`, `weight` and `port`.
+    It is not allowed to mix targets with and without those fields.
+    ([I#370](https://github.com/akamai/terraform-provider-akamai/issues/370))
+
+* Image and Video Manager
+  * Added support for `SmartCrop` transformation in `akamai_imaging_policy_image` datasource
+
+#### BUG FIXES:
+
+* CPS
+  * Fixed issue with terraform producing inconsistent final plan for `akamai_cps_upload_certificate` resource on SAN list modification in `akamai_cps_third_party_enrollment` resource.
+
 ## 6.0.0 (Mar 26, 2024)
 
 #### BREAKING CHANGES:

diff --git a/GNUmakefile b/GNUmakefile
@@ -14,6 +14,7 @@ BIN      = $(CURDIR)/bin
 GOCMD = go
 GOTEST = $(GOCMD) test
 GOBUILD = $(GOCMD) build
+GOMODTIDY = $(GOCMD) mod tidy
 M = $(shell echo ">")
 TFLINT = $(BIN)/tflint
 $(BIN)/tflint: $(BIN) ; $(info $(M) Installing tflint...)
@@ -47,20 +48,20 @@ install: build
 .PHONY: build
 build:
 	mkdir -p $(build_dir)
-	go build -o $(build_dir)/$(bin_name)
+	$(GOBUILD) -o $(build_dir)/$(bin_name)
 
 .PHONY: tidy
-tidy:
-	@go mod tidy
-	@cd tools && go mod tidy
+tidy: ; $(info $(M) Running go mod tidy...) @
+	@$(GOMODTIDY)
+	@cd tools && $(GOMODTIDY)
 
 .PHONY: test
 test:
-	go test $(TEST) -v $(TESTARGS) -timeout 40m 2>&1
+	$(GOTEST) $(TEST) -v $(TESTARGS) -timeout 40m 2>&1
 
 .PHONY: testacc
 testacc:
-	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 300m
+	TF_ACC=1 $(GOTEST) $(TEST) -v $(TESTARGS) -timeout 300m
 
 .PHONY: fmt
 fmt:  | $(GOIMPORTS); $(info $(M) Running goimports...) @ ## Run goimports on all source files
@@ -85,7 +86,6 @@ terraform-fmt:
 
 .PHONY: lint
 lint: | $(GOLANGCILINT) ; $(info $(M) Running golangci-lint...) @
-	go mod tidy
 	$Q $(BIN)/golangci-lint run
 
 .PHONY: terraform-lint
@@ -94,7 +94,7 @@ terraform-lint: | $(TFLINT) ; $(info $(M) Checking source code against tflint...
 
 .PHONY: test-compile
 test-compile:
-	go test -c ./akamai $(TESTARGS)
+	$(GOTEST) -c ./akamai $(TESTARGS)
 
 .PHONY: tools
 tools: $(TOOLS)

diff --git a/build/internal/docker_jenkins.bash b/build/internal/docker_jenkins.bash
@@ -96,6 +96,9 @@ docker exec akatf-container sh -c 'cd edgegrid; git checkout ${EDGEGRID_BRANCH_N
 echo "Installing terraform"
 docker exec akatf-container sh -c 'cd terraform-provider-akamai; make tools.terraform'
 
+echo "Running go mod tidy"
+docker exec akatf-container sh -c 'cd terraform-provider-akamai; make tidy'
+
 echo "Running golangci-lint"
 docker exec akatf-container sh -c 'cd terraform-provider-akamai; make lint'
 
@@ -106,7 +109,7 @@ echo "Running tflint on examples"
 docker exec akatf-container sh -c 'cd terraform-provider-akamai; make terraform-lint'
 
 echo "Running tests with xUnit output"
-docker exec akatf-container sh -c 'cd terraform-provider-akamai; go mod tidy;
+docker exec akatf-container sh -c 'cd terraform-provider-akamai;
                                    2>&1 go test -timeout $TIMEOUT -v -coverpkg=./... -coverprofile=../profile.out -covermode=$COVERMODE -skip TestClient_DefaultRetryPolicy_TLS ./... | tee ../tests.output'
 docker exec akatf-container sh -c 'cat tests.output | go-junit-report' > test/tests.xml
 docker exec akatf-container sh -c 'cat tests.output' > test/tests.output

diff --git a/docs/data-sources/data-sources.md b/docs/data-sources/data-sources.md
@@ -8,17 +8,17 @@ We’ve moved our documentation to the Akamai TechDocs site. Use the table to fi
 
 | Subprovider                                                                                       | Description                                                                                          |
 |---------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|
-| [Application Security](https://techdocs.akamai.com/terraform/v6.0/docs/appsec-datasources)        | Manage security configurations, security policies, match targets, rate policies, and firewall rules. |
-| [Bot Manager](https://techdocs.akamai.com/terraform/v6.0/docs/botman-datasources)                 | Identify, track, and respond to bot activity on your domain or in your app.                          |
-| [Certificates](https://techdocs.akamai.com/terraform/v6.0/docs/cps-datasources)                   | Full life cycle management of SSL certificates for your Akamai CDN applications.                   |
-| [Client Lists](https://techdocs.akamai.com/terraform/v6.0/docs/cli-data-sources)                  | Reduce harmful security attacks by allowing only trusted IP/CIDRs, locations, autonomous system numbers, and TLS fingerprints to access your services and content.|
-| [Cloud Wrapper](https://techdocs.akamai.com/terraform/v6.0/docs/cw-data-sources)                  | Provide your customers with a more consistent user experience by adding a custom caching layer that improves the connection between your cloud infrastructure and the Akamai platform.|
-| [Cloudlets](https://techdocs.akamai.com/terraform/v6.0/docs/cl-datasources)                       | Solve specific business challenges using value-added apps that complement Akamai's core solutions. |
-| [DataStream](https://techdocs.akamai.com/terraform/v6.0/docs/ds-datasources)                      | Monitor activity on the Akamai platform and send live log data to a destination of your choice.    |
-| [Edge DNS](https://techdocs.akamai.com/terraform/v6.0/docs/edns-datasources)                      | Replace or augment your DNS infrastructure with a cloud-based authoritative DNS solution.            |
-| [EdgeWorkers](https://techdocs.akamai.com/terraform/v6.0/docs/ew-datasources)                     | Execute JavaScript functions at the edge to optimize site performance and customize web experiences. |
-| [Global Traffic Management](https://techdocs.akamai.com/terraform/v6.0/docs/gtm-datasources)      | Use load balancing to manage website and mobile performance demands.                                 |
-| [Identity and Access Management](https://techdocs.akamai.com/terraform/v6.0/docs/iam-datasources) | Create users and groups, and define policies that manage access to your Akamai applications.         |
-| [Image and Video Manager](https://techdocs.akamai.com/terraform/v6.0/docs/ivm-datasources)        | Automate image and video delivery optimizations for your website visitors.                           |
-| [Network Lists](https://techdocs.akamai.com/terraform/v6.0/docs/nl-datasources)                   | Automate the creation, deployment, and management of lists used in Akamai security products.       |
-| [Property](https://techdocs.akamai.com/terraform/v6.0/docs/pm-datasources)                        | Define rules and behaviors that govern your website delivery based on match criteria.                |
+| [Application Security](https://techdocs.akamai.com/terraform/v6.1/docs/appsec-datasources)        | Manage security configurations, security policies, match targets, rate policies, and firewall rules. |
+| [Bot Manager](https://techdocs.akamai.com/terraform/v6.1/docs/botman-datasources)                 | Identify, track, and respond to bot activity on your domain or in your app.                          |
+| [Certificates](https://techdocs.akamai.com/terraform/v6.1/docs/cps-datasources)                   | Full life cycle management of SSL certificates for your Akamai CDN applications.                   |
+| [Client Lists](https://techdocs.akamai.com/terraform/v6.1/docs/cli-data-sources)                  | Reduce harmful security attacks by allowing only trusted IP/CIDRs, locations, autonomous system numbers, and TLS fingerprints to access your services and content.|
+| [Cloud Wrapper](https://techdocs.akamai.com/terraform/v6.1/docs/cw-data-sources)                  | Provide your customers with a more consistent user experience by adding a custom caching layer that improves the connection between your cloud infrastructure and the Akamai platform.|
+| [Cloudlets](https://techdocs.akamai.com/terraform/v6.1/docs/cl-datasources)                       | Solve specific business challenges using value-added apps that complement Akamai's core solutions. |
+| [DataStream](https://techdocs.akamai.com/terraform/v6.1/docs/ds-datasources)                      | Monitor activity on the Akamai platform and send live log data to a destination of your choice.    |
+| [Edge DNS](https://techdocs.akamai.com/terraform/v6.1/docs/edns-datasources)                      | Replace or augment your DNS infrastructure with a cloud-based authoritative DNS solution.            |
+| [EdgeWorkers](https://techdocs.akamai.com/terraform/v6.1/docs/ew-datasources)                     | Execute JavaScript functions at the edge to optimize site performance and customize web experiences. |
+| [Global Traffic Management](https://techdocs.akamai.com/terraform/v6.1/docs/gtm-datasources)      | Use load balancing to manage website and mobile performance demands.                                 |
+| [Identity and Access Management](https://techdocs.akamai.com/terraform/v6.1/docs/iam-datasources) | Create users and groups, and define policies that manage access to your Akamai applications.         |
+| [Image and Video Manager](https://techdocs.akamai.com/terraform/v6.1/docs/ivm-datasources)        | Automate image and video delivery optimizations for your website visitors.                           |
+| [Network Lists](https://techdocs.akamai.com/terraform/v6.1/docs/nl-datasources)                   | Automate the creation, deployment, and management of lists used in Akamai security products.       |
+| [Property](https://techdocs.akamai.com/terraform/v6.1/docs/pm-datasources)                        | Define rules and behaviors that govern your website delivery based on match criteria.                |
diff --git a/docs/guides/get-started.md b/docs/guides/get-started.md
@@ -21,7 +21,7 @@ Your Akamai Terraform configuration starts with listing us as a required provide
      required_providers {
        akamai = {
          source = "akamai/akamai"
-         version = "6.0.0"
+         version = "6.1.0"
        }
      }
    }
@@ -99,20 +99,20 @@ Use the table to find information about the subprovider you’re using.
 
 | Subprovider                                                                                  | Description                                                                                          |
 |----------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------|
-| [Application Security](https://techdocs.akamai.com/terraform/v6.0/docs/configure-appsec)     | Manage security configurations, security policies, match targets, rate policies, and firewall rules. |
-| [Bot Manager](https://techdocs.akamai.com/terraform/v6.0/docs/set-up-botman)                 | Identify, track, and respond to bot activity on your domain or in your app.                          |
-| [Certificates](https://techdocs.akamai.com/terraform/v6.0/docs/cps-integration-guide)        | Full life cycle management of SSL certificates for your Akamai CDN applications.                   |
-| [Client Lists](https://techdocs.akamai.com/terraform/v6.0/docs/set-up-client-lists)          | Reduce harmful security attacks by allowing only trusted IP/CIDRs, locations, autonomous system numbers, and TLS fingerprints to access your services and content.|
-| [Cloud Wrapper](https://techdocs.akamai.com/terraform/v6.0/docs/set-up-cloud-wrapper)        | Provide your customers with a more consistent user experience by adding a custom caching layer that improves the connection between your cloud infrastructure and the Akamai platform.|
-| [Cloudlets](https://techdocs.akamai.com/terraform/v6.0/docs/set-up-cloudlets)                | Solve specific business challenges using value-added apps that complement Akamai's core solutions. |
-| [DataStream](https://techdocs.akamai.com/terraform/v6.0/docs/set-up-datastream)              | Monitor activity on the Akamai platform and send live log data to a destination of your choice.    |
-| [Edge DNS](https://techdocs.akamai.com/terraform/v6.0/docs/set-up-edgedns)                   | Replace or augment your DNS infrastructure with a cloud-based authoritative DNS solution.            |
-| [EdgeWorkers](https://techdocs.akamai.com/terraform/v6.0/docs/set-up-edgeworkers)            | Execute JavaScript functions at the edge to optimize site performance and customize web experiences. |
-| [Global Traffic Management](https://techdocs.akamai.com/terraform/v6.0/docs/set-up-gtm)      | Use load balancing to manage website and mobile performance demands.                                 |
-| [Identity and Access Management](https://techdocs.akamai.com/terraform/v6.0/docs/set-up-iam) | Create users and groups, and define policies that manage access to your Akamai applications.         |
-| [Image and Video Manager](https://techdocs.akamai.com/terraform/v6.0/docs/set-up-ivm)        | Automate image and video delivery optimizations for your website visitors.                           |
-| [Network Lists](https://techdocs.akamai.com/terraform/v6.0/docs/set-up-network-lists)        | Automate the creation, deployment, and management of lists used in Akamai security products.       |
-| [Property](https://techdocs.akamai.com/terraform/v6.0/docs/set-up-property-provisioning)     | Define rules and behaviors that govern your website delivery based on match criteria.                |
+| [Application Security](https://techdocs.akamai.com/terraform/v6.1/docs/configure-appsec)     | Manage security configurations, security policies, match targets, rate policies, and firewall rules. |
+| [Bot Manager](https://techdocs.akamai.com/terraform/v6.1/docs/set-up-botman)                 | Identify, track, and respond to bot activity on your domain or in your app.                          |
+| [Certificates](https://techdocs.akamai.com/terraform/v6.1/docs/cps-integration-guide)        | Full life cycle management of SSL certificates for your Akamai CDN applications.                   |
+| [Client Lists](https://techdocs.akamai.com/terraform/v6.1/docs/set-up-client-lists)          | Reduce harmful security attacks by allowing only trusted IP/CIDRs, locations, autonomous system numbers, and TLS fingerprints to access your services and content.|
+| [Cloud Wrapper](https://techdocs.akamai.com/terraform/v6.1/docs/set-up-cloud-wrapper)        | Provide your customers with a more consistent user experience by adding a custom caching layer that improves the connection between your cloud infrastructure and the Akamai platform.|
+| [Cloudlets](https://techdocs.akamai.com/terraform/v6.1/docs/set-up-cloudlets)                | Solve specific business challenges using value-added apps that complement Akamai's core solutions. |
+| [DataStream](https://techdocs.akamai.com/terraform/v6.1/docs/set-up-datastream)              | Monitor activity on the Akamai platform and send live log data to a destination of your choice.    |
+| [Edge DNS](https://techdocs.akamai.com/terraform/v6.1/docs/set-up-edgedns)                   | Replace or augment your DNS infrastructure with a cloud-based authoritative DNS solution.            |
+| [EdgeWorkers](https://techdocs.akamai.com/terraform/v6.1/docs/set-up-edgeworkers)            | Execute JavaScript functions at the edge to optimize site performance and customize web experiences. |
+| [Global Traffic Management](https://techdocs.akamai.com/terraform/v6.1/docs/set-up-gtm)      | Use load balancing to manage website and mobile performance demands.                                 |
+| [Identity and Access Management](https://techdocs.akamai.com/terraform/v6.1/docs/set-up-iam) | Create users and groups, and define policies that manage access to your Akamai applications.         |
+| [Image and Video Manager](https://techdocs.akamai.com/terraform/v6.1/docs/set-up-ivm)        | Automate image and video delivery optimizations for your website visitors.                           |
+| [Network Lists](https://techdocs.akamai.com/terraform/v6.1/docs/set-up-network-lists)        | Automate the creation, deployment, and management of lists used in Akamai security products.       |
+| [Property](https://techdocs.akamai.com/terraform/v6.1/docs/set-up-property-provisioning)     | Define rules and behaviors that govern your website delivery based on match criteria.                |
 
 ### Get contract and group IDs