Release/v1.9.0

.goreleaser.yml

@@ -15,7 +15,7 @@ builds:
     - -trimpath
     - -tags=all
   ldflags:
-    - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}'
+    - -s -w -X github.com/akamai/terraform-provider-akamai/v2/version.ProviderVersion={{.Version}}
   goos:
     - windows
     - linux

.travis.yml

@@ -10,16 +10,20 @@ branches:
 
 language: go
 go:
-- "1.12.9"
+- "1.14"
 
 env:
   - GO111MODULE=on
-    GOFLAGS=-mod=vendor
+  - GOBIN=$GOPATH/bin
 
 install:
-- make tools
+- make init
+- make tools.terraform
+- make dummy-edgerc
 
 script:
+- make check
 - make test
 - make build
-- make website-test
+- make terraform-fmt
+- make terraform-lint

CHANGELOG.md

@@ -1,5 +1,42 @@
 # RELEASE NOTES
 
+## 1.9.0 (Dec 6, 2021)
+
+#### FEATURES/ENHANCEMENTS
+* [IMPORTANT] Added Cloudlets API support
+  * Added resources allowing management of policy and policy activations:
+    * `akamai_cloudlets_policy` - create, read, update, delete and import policy
+    * `akamai_cloudlets_policy_activation` - create, read, update and delete policy activations
+  * Added resources allowing management of application load balancer configuration and application load balancer activations:
+    * `akamai_cloudlets_application_load_balancer` - create, read, update, delete and import application load balancer configuration
+    * `akamai_cloudlets_application_load_balancer_activation` - create, read, update and delete application load balancer activations
+  * Added data sources:
+    * `akamai_cloudlets_policy` - lists information about policy
+    * `akamai_cloudlets_application_load_balancer` - lists information about application load balancer configuration 
+    * `akamai_cloudlets_application_load_balancer_match_rule` - lists information about application load balancer match rules
+    * `akamai_cloudlets_edge_redirector_match_rule` - lists information about edge redirector match rules
+* APPSEC
+  * Add group/contract ID support to network list resource ([#243](https://github.com/akamai/terraform-provider-akamai/issues/243))
+  * Add tuning recommendations data source
+  * Add support for advanced exceptions in ASE rules
+  * Update WAP bypass network lists for multi-policy WAP
+  * Deprecate WAP-only datasource & resources
+* PAPI
+  * Updated documentation for data source akamai_property_rules
+  * Allowed user to select a rule format in `resource akamai_property`
+  * Added optional `use_cases` attribute for `akamai_edge_hostname` resource
+#### BUG FIXES:
+* Fixed example usage for provider import ([#212](https://github.com/akamai/terraform-provider-akamai/pull/212))
+* PAPI
+  * Removing default value for `ip_behavior` in `akamai_edge_hostname` resource ([#213](https://github.com/akamai/terraform-provider-akamai/pull/213))
+  * Returned an error if `edge_hostname` attribute in `akamai_edge_hostname` resource does not exist  ([#258](https://github.com/akamai/terraform-provider-akamai/issues/258))
+* CPS
+  * Attribute `dns_challenges` should not be empty on initial apply for `akamai_cps_dv_enrollment` resource ([#253](https://github.com/akamai/terraform-provider-akamai/issues/253))
+* DATASTREAM
+  * Attribute `dataset_fields_ids` should not be sorted numerically in `akamai_datastream` resource ([#263](https://github.com/akamai/terraform-provider-akamai/issues/263))
+* GTM
+  * Attribute `datacenter_id` should be required in `akamai_gtm_geomap` resource ([#259](https://github.com/akamai/terraform-provider-akamai/issues/259))
+
 ## 1.8.0 (Oct 25, 2021)
 
 #### FEATURES/ENHANCEMENTS:

GNUmakefile

@@ -31,16 +31,17 @@ check: errcheck fmtcheck lint vet
 
 .PHONY: test
 test: fmtcheck
-	go test $(TEST) -v $(TESTARGS) -timeout 10m
+	go test $(TEST) -v $(TESTARGS) -timeout 20m 2>&1 
 
 .PHONY: testacc
 testacc: fmtcheck
 	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 300m
 
 .PHONY: vet
 vet:
-	@echo "go vet ."
-	@go vet $$(go list ./...); if [ $$? -eq 1 ]; then \
+	@echo "==> Checking source code against vet"
+	# Appsec package excluded until https://track.akamai.com/jira/browse/SECKSD-12824 is done
+	@go vet $$(go list ./... | grep -v appsec); if [ $$? -ne 0 ]; then \
 		echo ""; \
 		echo "Vet found suspicious constructs. Please check the reported constructs"; \
 		echo "and fix them if necessary before submitting the code for review."; \
@@ -51,6 +52,10 @@ vet:
 fmt:
 	gofmt -w $(GOFMT_FILES)
 
+.PHONY: terraform-fmt
+terraform-fmt:
+	terraform fmt -recursive -check
+
 .PHONY: fmtcheck
 fmtcheck:
 	@sh -c "'$(CURDIR)/scripts/gofmtcheck.sh'"
@@ -64,6 +69,11 @@ lint:
 	@echo "==> Checking source code against golangci-lint"
 	@$$(go env GOPATH)/bin/golangci-lint run
 
+.PHONY: terraform-lint
+terraform-lint:
+	@echo "==> Checking source code against tflint"
+	@find ./examples -type f -name "*.tf" | xargs -I % dirname % | sort -u | xargs -I @ sh -c "echo @ && tflint @"
+
 .PHONY: test-compile
 test-compile:
 	go test -c ./akamai $(TESTARGS)
@@ -73,5 +83,18 @@ tools.golangci-lint:
 	@echo Installing golangci-lint
 	@curl -sSfL https://github.com/raw/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin $(golangci-lint-version)
 
+.PHONY: tools.tflint
+tools.tflint:
+	@echo Installing tf-lint
+	@curl -s https://github.com/raw/terraform-linters/tflint/master/install_linux.sh | bash
+
 .PHONY: init
-init: tools.golangci-lint
+init: tools.golangci-lint tools.tflint
+
+.PHONY: dummy-edgerc
+dummy-edgerc:
+	@sh -c "'$(CURDIR)/scripts/dummyedgerc.sh'"
+
+.PHONY: tools.terraform
+tools.terraform:
+	@sh -c "'$(CURDIR)/scripts/install_terraform.sh'"

build/internal/docker_jenkins.bash

@@ -2,11 +2,18 @@
 # This script will build the provider and associated library after checking out from git on jenkins.
 #
 # It uses the same docker image for all builds unless RELOAD_DOCKER_IMAGE parameter is set true.
+
+# Script will end immediately when some command exits with a non-zero exit code.
+set -e
+
 PROVIDER_BRANCH_NAME="${1:-develop}"
 EDGEGRID_BRANCH_NAME_V2="${2:-v2}"
 EDGEGRID_BRANCH_NAME_V1="${3:-develop}"
 RELOAD_DOCKER_IMAGE="${4:-false}"
+
+# Recalculate DOCKER_IMAGE_SIZE if any changes to dockerfile.
 TIMEOUT="20m"
+DOCKER_IMAGE_SIZE="642345946"
 
 SSH_PRV_KEY="$(cat ~/.ssh/id_rsa)"
 SSH_PUB_KEY="$(cat ~/.ssh/id_rsa.pub)"
@@ -41,7 +48,8 @@ if [[ "$RELOAD_DOCKER_IMAGE" == true ]]; then
   docker image rm -f terraform/akamai:terraform-provider-akamai 2> /dev/null || true
 fi
 
-if [[ "$(docker images -q terraform/akamai:terraform-provider-akamai 2> /dev/null)" == "" ]]; then
+if [[ "$(docker images -q terraform/akamai:terraform-provider-akamai 2> /dev/null)" == "" ||
+      "$(docker inspect -f '{{ .Size }}' terraform/akamai:terraform-provider-akamai)" != "$DOCKER_IMAGE_SIZE" ]]; then
   echo "Building new image terraform/akamai:terraform-provider-akamai"
   DOCKER_BUILDKIT=1 docker build \
     -f build/internal/package/Dockerfile \
@@ -50,7 +58,6 @@ if [[ "$(docker images -q terraform/akamai:terraform-provider-akamai 2> /dev/nul
     -t terraform/akamai:terraform-provider-akamai .
 fi
 
-
 echo "Creating docker container"
 docker run -d -it --name akatf-container --entrypoint "/usr/bin/tail" \
         -e TF_LOG=DEBUG \
@@ -109,4 +116,10 @@ docker exec akatf-container sh -c 'cd terraform-provider-akamai; go install -tag
                                    mkdir -p /root/.terraform.d/plugins/registry.terraform.io/akamai/akamai/${PROVIDER_VERSION}/linux_amd64;
                                    cp /root/go/bin/terraform-provider-akamai /root/.terraform.d/plugins/registry.terraform.io/akamai/akamai/${PROVIDER_VERSION}/linux_amd64/terraform-provider-akamai_v${PROVIDER_VERSION}'
 
+echo "Running terraform fmt"
+docker exec akatf-container sh -c 'cd terraform-provider-akamai; terraform fmt -recursive -check'
+
+echo "Running tflint on examples"
+docker exec akatf-container sh -c 'cd terraform-provider-akamai; find ./examples -type f -name "*.tf" | xargs -I % dirname % | sort -u | xargs -I @ sh -c "echo @ && tflint @"'
+
 docker rm -f akatf-container 2> /dev/null || true

build/internal/package/Dockerfile

@@ -13,11 +13,12 @@ ARG SSH_PUB_KEY
 ARG SSH_KNOWN_HOSTS
 WORKDIR $GOPATH/src/github.com/akamai
 
-RUN apk add --update git bash openssh go gcc musl-dev openssl-dev ca-certificates && \
+RUN apk add --update git bash sudo openssh go gcc musl-dev openssl-dev ca-certificates unzip curl && \
     go get -u github.com/jstemmer/go-junit-report && \
     go get -u github.com/axw/gocov/... && \
     go get -u github.com/AlekSi/gocov-xml && \
-    mkdir -p /root/.ssh
+    mkdir -p /root/.ssh && \
+    curl -s https://github.com/raw/terraform-linters/tflint/master/install_linux.sh | bash
 
 ADD build/internal/package/AkamaiCorpRoot-G1.pem /usr/local/share/ca-certificates/AkamaiCorpRoot-G1.pem
 RUN update-ca-certificates

build/internal/package/nexus-release.bash

@@ -44,6 +44,7 @@ find_branch() {
     do
       echo "Checking branch '${branch}'"
       EDGEGRID_BRANCH=$branch
+
       if [[ "$EDGEGRID_BRANCH" == "develop" ]]; then
         EDGEGRID_BRANCH="v2"
       fi
@@ -66,14 +67,15 @@ clone_edgegrid() {
     echo "Repository 'akamaiopen-edgegrid-golang' already exists, so only cleaning and updating it"
     pushd akamaiopen-edgegrid-golang
     git reset --hard
-    git fetch
+    git fetch -p
     popd
   fi
 }
 
 checkout_edgegrid() {
   pushd akamaiopen-edgegrid-golang
-  git checkout $EDGEGRID_BRANCH
+  git checkout $EDGEGRID_BRANCH -f
+  git reset --hard origin/$EDGEGRID_BRANCH
   git pull
   popd
 }
@@ -132,6 +134,8 @@ if [[ "$RELEASE_TYPE" == "snapshot" ]]; then
 else
   mod_edit
 fi
-./build/internal/docker_jenkins.bash "$CURRENT_BRANCH" "$EDGEGRID_BRANCH"
+if ! ./build/internal/docker_jenkins.bash "$CURRENT_BRANCH" "$EDGEGRID_BRANCH"; then
+  exit 1
+fi
 build
 nexus_push

docs/data-sources/appsec_eval_hostnames.md

@@ -11,9 +11,11 @@ description: |-
 
 **Scopes**: Security configuration
 
-Returns the evaluation hostnames for a configuration. In evaluation mode, you use evaluation hosts to monitor how well your configuration settings protects host traffic. (Note that the evaluation host isn't actually protected, and the host takes no action other than recording the actions it would have taken had it been on the production network).
+**Important**: This data source is deprecated and may be removed in a future release. You may use the `akamai_appsec_wap_selected_hostnames` data source instead.
 
-Evaluation mode for hostnames is only available for organizations running Web Application Protector.
+Returns the evaluation hostnames for a configuration. In evaluation mode, you use evaluation hosts to monitor how well your configuration settings protect host traffic. (Note that the evaluation host isn't actually protected, and the host takes no action other than recording the actions it would have taken had it been on the production network.)
+
+Evaluation mode for hostnames is available only for organizations running Web Application Protector.
 
 **Related API Endpoint**: [/appsec/v1/configs/{configId}/versions/{versionNumber}/selected-hostnames/eval-hostnames](https://developer.akamai.com/api/cloud_security/application_security/v1.html#getevaluationhostnames)
 

docs/data-sources/appsec_eval_rules.md

@@ -1,9 +1,9 @@
 ---
 layout: "akamai"
-page_title: "Akamai: KRS Eval Rule"
+page_title: "Akamai: Evaluation Rule"
 subcategory: "Application Security"
 description: |-
- KRS Eval Rules
+ Evaluation Rules
 ---
 
 

docs/data-sources/appsec_tuning_recommendation.md

@@ -0,0 +1,79 @@
+---
+layout: "akamai"
+page_title: "Akamai: TuningRecommendation"
+subcategory: "Application Security"
+description: |-
+ TuningRecommendation
+---
+
+# akamai_appsec_tuning_recommendation
+
+**Scopes**: Security policy; attack group
+
+Returns tuning recommendations for the specified attack group (or, if the **attack_group** argument is not included, returns tuning recommendations for all the attack groups in the specified security policy). Tuning recommendations help minimize the number of false positives triggered by a security policy; with a false positive, a client request is marked as having violated the security policy restrictions even though it didn't actually violate those restrictions. Tuning recommendations are returned as attack group exceptions: if you choose, you can copy the response and use the [akamai_appsec_attack_group](https://registry.terraform.io/providers/akamai/akamai/latest/docs/resources/appsec_attack_group) resource to add the recommended exception to a security policy or attack group
+
+If the data source response is empty, that means that there are no further recommendations for tuning your security policy or attack group.
+
+If you need to, you can manually merge a recommended exception for an attack group with the exception previously configured in the attack group resource. 
+Additional information is available in the [Application Security API v1 documentation](https://developer.akamai.com/api/cloud_security/application_security/v1.html#getrecommendations).
+
+**Related API endpoint**: [/appsec/v1/configs/{configId}/versions/{versionNumber}/security-policies/{policyId}/recommendation](https://developer.akamai.com/api/cloud_security/application_security/v1.html#gettuningrecommendationsforanattackgroup)s
+
+## Example usage
+
+```
+terraform {
+ required_providers
+  akamai  = {
+   source = "akamai/akamai"
+
+ }
+}
+
+provider "akamai" {
+ edgerc = "~/.edgerc"
+}
+
+// USE CASE: user wants to view tuning recommendations for the specified security policy or for the specified attack group
+
+data "akamai_appsec_configuration" "configuration" {
+ name = "Documentation"
+}
+
+data "akamai_appsec_tuning_recommendations" "policy_recommendations" {
+ config_id          = data.akamai_appsec_configuration.configuration.config_id
+ security_policy_id = "gms1_134637"
+}
+
+output "policy_recommendations_json" {
+ value = data.akamai_appsec_tuning_recommendations.policy_recommendations.jso
+}
+
+data "akamai_appsec_tuning_recommendations" "attack_group_recommendations" {
+ config_id          = data.akamai_appsec_configuration.configuration.config_id
+ security_policy_id = "gms1_134637"
+ attack_group       = "SQL"
+}
+
+output "attack_group_recommendations_json" {
+ value = data.akamai_appsec_tuning_recommendations.attack_group_recommendations.json
+}
+```
+
+
+
+## Argument reference
+
+This data source supports the following arguments:
+
+- **config_id** (required). Unique identifier of the security configuration you want to return tuning recommendations for.
+- **security_policy_id** (required). Unique identifier of the security policy you want to return tuning recommendations for.
+- **attack_group** (optional). Unique name of the attack group you want to return tuning recommendations for. If not included, recommendations are returned for all your attack groups.
+
+
+
+## Output options
+
+The following options can be used to determine the information returned, and how that returned information is formatted:
+
+- **json**. JSON-formatted list of the tuning recommendations for the security policy or the attack group.