DXE-3891 Merge pull request #72 from akamai/release/v1.15.0

DXE-3891 Release/v1.15.0
akamai · May 28, 2024 · 431ee30 · 431ee30
2 parents dcb71df + 7ce43da
commit 431ee30
Show file tree

Hide file tree

Showing 79 changed files with 1,000 additions and 100 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Release Notes
 
+## Version 1.15.0 (May 28, 2024)
+
+### Features/Enhancements
+
+* General
+  * Updated various dependencies
+
+* Cloudlets
+  * Added import support for `akamai_cloudlets_application_load_balancer_activation` resource
+
+* PAPI
+  * Added export of the `certificate` for `akamai_edge_hostname` resource ([I#338](https://github.com/akamai/terraform-provider-akamai/issues/338))
+
 ## Version 1.14.0 (April 23, 2024)
 
 ### Features/Enhancements

diff --git a/cli.json b/cli.json
@@ -5,7 +5,7 @@
   "commands": [
     {
       "name": "terraform",
-      "version": "1.14.0",
+      "version": "1.15.0",
       "description": "Administer and Manage Akamai Terraform configurations",
       "bin": "https://github.com/akamai/cli-terraform/releases/download/v{{.Version}}/akamai-{{.Name}}-{{.Version}}-{{.OS}}{{.Arch}}{{.BinSuffix}}",
       "auto-complete": true,

diff --git a/cli/cli.go b/cli/cli.go
@@ -33,7 +33,7 @@ import (
 
 var (
 	// Version holds current version of cli-terraform
-	Version = "1.14.0"
+	Version = "1.15.0"
 )
 
 // Run initializes the cli and runs it

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/akamai/cli-terraform
 go 1.21
 
 require (
-	github.com/akamai/AkamaiOPEN-edgegrid-golang/v8 v8.1.0
+	github.com/akamai/AkamaiOPEN-edgegrid-golang/v8 v8.2.0
 	github.com/akamai/cli v1.5.6
 	github.com/fatih/color v1.13.0
 	github.com/hashicorp/hcl/v2 v2.11.1

diff --git a/go.sum b/go.sum
@@ -9,8 +9,8 @@ github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDO
 github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
 github.com/agext/levenshtein v1.2.1 h1:QmvMAjj2aEICytGiWzmxoE0x2KZvE0fvmqMOfy2tjT8=
 github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
-github.com/akamai/AkamaiOPEN-edgegrid-golang/v8 v8.1.0 h1:peKT873AjrueDF69cYQolgE2ehxCpOw/8py4F43iU/M=
-github.com/akamai/AkamaiOPEN-edgegrid-golang/v8 v8.1.0/go.mod h1:ytNNwwgBIEeWJJCWy57vbkkEaYiCxWrYU68B/F0Gi5g=
+github.com/akamai/AkamaiOPEN-edgegrid-golang/v8 v8.2.0 h1:aN4wkKx/Wu2zk6iM1yYXSI5Pu/6dzvUvleUUZojsp5E=
+github.com/akamai/AkamaiOPEN-edgegrid-golang/v8 v8.2.0/go.mod h1:2xRRnHx8dnw0i8IZPYOI0I7xbr1gnAN1uIYo7acMIbg=
 github.com/akamai/cli v1.5.6 h1:L/QsSqligFRhMD+tKJoX9cwqbHnmojfqXw64HUfp6gk=
 github.com/akamai/cli v1.5.6/go.mod h1:PwHrS8f2vh1Kns2Hl1rtfMCq90ZfYLXI81zRGDTkMRs=
 github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 h1:MzBOUgng9orim59UnfUTLRjMpd09C5uEVQ6RPGeCaVI=

diff --git a/pkg/providers/cloudlets/templates/imports.tmpl b/pkg/providers/cloudlets/templates/imports.tmpl
@@ -3,6 +3,9 @@ terraform init
 {{- range .LoadBalancers}}
 terraform import akamai_cloudlets_application_load_balancer.load_balancer_{{.OriginID}} {{.OriginID}}
 {{- end}}
+{{- range .LoadBalancerActivations}}
+terraform import akamai_cloudlets_application_load_balancer_activation.load_balancer_activation_{{.OriginID}} {{.OriginID}},{{.Network}},{{.Version}}
+{{- end}}
 terraform import akamai_cloudlets_policy.policy {{.Name}}
 {{- with .PolicyActivations -}}
 {{- if (and .Production .Staging) -}}

diff --git a/pkg/providers/cloudlets/templates/policy.tmpl b/pkg/providers/cloudlets/templates/policy.tmpl
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     akamai = {
       source = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/no_activations_no_match_rules/policy.tf b/pkg/providers/cloudlets/testdata/no_activations_no_match_rules/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/no_activations_with_escaped_strings_alb/policy.tf b/pkg/providers/cloudlets/testdata/no_activations_with_escaped_strings_alb/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/no_activations_with_escaped_strings_er/policy.tf b/pkg/providers/cloudlets/testdata/no_activations_with_escaped_strings_er/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/no_activations_with_match_rules/policy.tf b/pkg/providers/cloudlets/testdata/no_activations_with_match_rules/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/no_activations_with_matches_always/policy.tf b/pkg/providers/cloudlets/testdata/no_activations_with_matches_always/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/no_activations_with_two_alb/policy.tf b/pkg/providers/cloudlets/testdata/no_activations_with_two_alb/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/no_match_rules_alb/policy.tf b/pkg/providers/cloudlets/testdata/no_match_rules_alb/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/no_match_rules_ap/policy.tf b/pkg/providers/cloudlets/testdata/no_match_rules_ap/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/no_match_rules_as/policy.tf b/pkg/providers/cloudlets/testdata/no_match_rules_as/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/no_match_rules_cd/policy.tf b/pkg/providers/cloudlets/testdata/no_match_rules_cd/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/no_match_rules_fr/policy.tf b/pkg/providers/cloudlets/testdata/no_match_rules_fr/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/no_match_rules_ig/policy.tf b/pkg/providers/cloudlets/testdata/no_match_rules_ig/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/no_match_rules_vp/policy.tf b/pkg/providers/cloudlets/testdata/no_match_rules_vp/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/no_version/policy.tf b/pkg/providers/cloudlets/testdata/no_version/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/v3/v3_no_match_rules/policy.tf b/pkg/providers/cloudlets/testdata/v3/v3_no_match_rules/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/v3/v3_no_version/policy.tf b/pkg/providers/cloudlets/testdata/v3/v3_no_version/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/v3/v3_with_ap_match_rules/policy.tf b/pkg/providers/cloudlets/testdata/v3/v3_with_ap_match_rules/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/v3/v3_with_as_match_rules/policy.tf b/pkg/providers/cloudlets/testdata/v3/v3_with_as_match_rules/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/v3/v3_with_both_activations/policy.tf b/pkg/providers/cloudlets/testdata/v3/v3_with_both_activations/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/v3/v3_with_cd_match_rules/policy.tf b/pkg/providers/cloudlets/testdata/v3/v3_with_cd_match_rules/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/v3/v3_with_er_match_rules/policy.tf b/pkg/providers/cloudlets/testdata/v3/v3_with_er_match_rules/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/v3/v3_with_fr_match_rules/policy.tf b/pkg/providers/cloudlets/testdata/v3/v3_with_fr_match_rules/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/v3/v3_with_ig_match_rules/policy.tf b/pkg/providers/cloudlets/testdata/v3/v3_with_ig_match_rules/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/v3/v3_with_prod_activation/policy.tf b/pkg/providers/cloudlets/testdata/v3/v3_with_prod_activation/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/v3/v3_with_staging_activation/policy.tf b/pkg/providers/cloudlets/testdata/v3/v3_with_staging_activation/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/with_activations_and_match_rules/policy.tf b/pkg/providers/cloudlets/testdata/with_activations_and_match_rules/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/with_activations_and_match_rules_alb/import.sh b/pkg/providers/cloudlets/testdata/with_activations_and_match_rules_alb/import.sh
@@ -1,3 +1,5 @@
 terraform init
 terraform import akamai_cloudlets_application_load_balancer.load_balancer_test_origin test_origin
+terraform import akamai_cloudlets_application_load_balancer_activation.load_balancer_activation_test_origin test_origin,PRODUCTION,2
+terraform import akamai_cloudlets_application_load_balancer_activation.load_balancer_activation_test_origin test_origin,STAGING,2
 terraform import akamai_cloudlets_policy.policy test_policy_export
diff --git a/pkg/providers/cloudlets/testdata/with_activations_and_match_rules_alb/policy.tf b/pkg/providers/cloudlets/testdata/with_activations_and_match_rules_alb/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/with_match_rules_alb/policy.tf b/pkg/providers/cloudlets/testdata/with_match_rules_alb/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/with_match_rules_ap/policy.tf b/pkg/providers/cloudlets/testdata/with_match_rules_ap/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/with_match_rules_as/policy.tf b/pkg/providers/cloudlets/testdata/with_match_rules_as/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/with_match_rules_cd/policy.tf b/pkg/providers/cloudlets/testdata/with_match_rules_cd/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/with_match_rules_fr/policy.tf b/pkg/providers/cloudlets/testdata/with_match_rules_fr/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/with_match_rules_ig/policy.tf b/pkg/providers/cloudlets/testdata/with_match_rules_ig/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/with_match_rules_vp/policy.tf b/pkg/providers/cloudlets/testdata/with_match_rules_vp/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/cloudlets/testdata/with_single_activation/policy.tf b/pkg/providers/cloudlets/testdata/with_single_activation/policy.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 5.6.0"
+      version = ">= 6.2.0"
     }
   }
   required_version = ">= 1.0"