DXE-3579 Update CHANGELOG and cli version and tfp version update

akamai · Mar 21, 2024 · 2a2803e · 2a2803e
1 parent 4cca3cf
commit 2a2803e
Show file tree

Hide file tree

Showing 97 changed files with 121 additions and 166 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,80 +1,34 @@
 # Release Notes
 
-## Version x.x.x (XXX xx, xxxx)
+## Version 1.13.0 (March 26, 2024)
 
 ### Features/Enhancements
 
-* Cloudlets
-    * Changed export for `akamai_cloudlets_audience_segmentation_match_rule` to generate empty `forward_settings` when `origin_id` and `path_and_qs` both are empty and `use_incoming_query_string` is false
-
+* General
+  * Updated minimal required terraform version to 1.0
+  * Migrate to go 1.21
 * Appsec
-  *  Added support to export `akamai_appsec_penalty_box_conditions` for the specified policy.
-  *  Added support to export `akamai_appsec_eval_penalty_box_conditions` for the specified policy.
-
-
-* Updated minimal required terraform version to 1.0
-
-
-
-* Migrate to go 1.21
-
-
-
-
-* PAPI
-  * `export-property` command with flag `--rules-as-hcl` now supports export of properties in frozen format `v2024-02-12`
-  * `export-property-include` command with flag `--rules-as-hcl` now supports export of includes in frozen format `v2024-02-12`
-
-
-
-
+  *  Added support to export `akamai_appsec_penalty_box_conditions` for the specified policy
+  *  Added support to export `akamai_appsec_eval_penalty_box_conditions` for the specified policy
+* Cloudlets
+  * Changed export for `akamai_cloudlets_audience_segmentation_match_rule` to generate empty `forward_settings` when `origin_id` and `path_and_qs` both are empty and `use_incoming_query_string` is false
 * GTM
   * Added support for exporting fields:
     * `sign_and_serve`, `sign_and_serve_algorithm` for `akamai_gtm_domain` resource
     * `http_method`, `http_request_body`, `pre_2023_security_posture`, `alternate_ca_certificate` inside `liveness_test` in `akamai_gtm_property` resource
-
-
-
-
-
-
-
-
-
-
+* PAPI
+  * `export-property` command with flag `--rules-as-hcl` now supports export of properties in frozen format `v2024-02-12`
+  * `export-property-include` command with flag `--rules-as-hcl` now supports export of includes in frozen format `v2024-02-12`
 
 ### Bug fixes
 
-
 * PAPI
   * Fixed issue that empty `custom_certificate_authorities` or `custom_certificates` where not generated during `export-property` with `rules-as-hcl` flag
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 ### Deprecations
 
 * APPSEC
-  * Exclude the deprecated `akamai_appsec_selected_hostnames` resource from the `export-appsec` command. Use exported `akamai_appsec_configuration` instead.
+  * Exclude the deprecated `akamai_appsec_selected_hostnames` resource from the `export-appsec` command. Use exported `akamai_appsec_configuration` instead
 
 ## Version 1.12.0 (February 19, 2024)
 

diff --git a/build/docker_jenkins.bash b/build/docker_jenkins.bash
@@ -91,7 +91,7 @@ docker exec akatf-container sh -c 'cd edgegrid; git checkout ${EDGEGRID_BRANCH_N
                                    cd ../cli; git checkout ${CLI_BRANCH_NAME};
                                    go mod tidy;
                                    cd ../cli-terraform; git checkout ${CLI_TERRAFORM_BRANCH_NAME};
-                                   go mod edit -replace github.com/akamai/AkamaiOPEN-edgegrid-golang/v7=../edgegrid;
+                                   go mod edit -replace github.com/akamai/AkamaiOPEN-edgegrid-golang/v8=../edgegrid;
                                    go mod edit -replace github.com/akamai/cli=../cli;
                                    go mod tidy'
 

diff --git a/cli.json b/cli.json
@@ -5,7 +5,7 @@
   "commands": [
     {
       "name": "terraform",
-      "version": "1.12.0",
+      "version": "1.13.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
@@ -21,7 +21,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/session"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/session"
 	"github.com/akamai/cli-terraform/pkg/commands"
 	"github.com/akamai/cli-terraform/pkg/edgegrid"
 	akacli "github.com/akamai/cli/pkg/app"
@@ -33,7 +33,7 @@ import (
 
 var (
 	// Version holds current version of cli-terraform
-	Version = "1.12.0"
+	Version = "1.13.0"
 )
 
 // Run initializes the cli and runs it

diff --git a/cli/cli_test.go b/cli/cli_test.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/session"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/session"
 	"github.com/akamai/cli/pkg/log"
 	"github.com/stretchr/testify/assert"
 	"github.com/urfave/cli/v2"

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/v7 v7.6.0
+	github.com/akamai/AkamaiOPEN-edgegrid-golang/v8 v8.0.0
 	github.com/akamai/cli v1.5.6
 	github.com/fatih/color v1.13.0
 	github.com/hashicorp/hcl/v2 v2.11.1
@@ -55,5 +55,5 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-//replace github.com/akamai/AkamaiOPEN-edgegrid-golang/v7 => ../akamaiopen-edgegrid-golang
+//replace github.com/akamai/AkamaiOPEN-edgegrid-golang/v8 => ../akamaiopen-edgegrid-golang
 //replace github.com/akamai/cli => ../cli
diff --git a/go.sum b/go.sum
@@ -9,8 +9,9 @@ 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/v7 v7.6.0 h1:Y6DiIpp6fWR01YaK65PqTV8wiatLOaN8rBPzqfmjb7Y=
-github.com/akamai/AkamaiOPEN-edgegrid-golang/v7 v7.6.0/go.mod h1:gajRk0oNRQj4bHUc2SGAvAp/gPestSpuvK4QXU1QtPA=
+github.com/akamai/AkamaiOPEN-edgegrid-golang/v8 v7.6.0 h1:Y6DiIpp6fWR01YaK65PqTV8wiatLOaN8rBPzqfmjb7Y=
+github.com/akamai/AkamaiOPEN-edgegrid-golang/v8 v7.6.0/go.mod h1:gajRk0oNRQj4bHUc2SGAvAp/gPestSpuvK4QXU1QtPA=
+github.com/akamai/AkamaiOPEN-edgegrid-golang/v8 v8.0.0/go.mod h1:ytNNwwgBIEeWJJCWy57vbkkEaYiCxWrYU68B/F0Gi5g=
 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/edgegrid/config.go b/pkg/edgegrid/config.go
@@ -2,7 +2,7 @@
 package edgegrid
 
 import (
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/edgegrid"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/edgegrid"
 	"github.com/urfave/cli/v2"
 )
 

diff --git a/pkg/edgegrid/config_test.go b/pkg/edgegrid/config_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/edgegrid"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/edgegrid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"

diff --git a/pkg/edgegrid/session.go b/pkg/edgegrid/session.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/session"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/session"
 	"github.com/urfave/cli/v2"
 )
 

diff --git a/pkg/edgegrid/session_test.go b/pkg/edgegrid/session_test.go
@@ -5,7 +5,7 @@ import (
 	"flag"
 	"testing"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/session"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/session"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/urfave/cli/v2"

diff --git a/pkg/providers/appsec/create_appsec.go b/pkg/providers/appsec/create_appsec.go
@@ -12,8 +12,8 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/appsec"
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/botman"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/appsec"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/botman"
 	"github.com/akamai/cli-terraform/pkg/edgegrid"
 	"github.com/akamai/cli-terraform/pkg/templates"
 	"github.com/akamai/cli-terraform/pkg/tools"

diff --git a/pkg/providers/appsec/create_appsec_test.go b/pkg/providers/appsec/create_appsec_test.go
@@ -11,8 +11,8 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/appsec"
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/botman"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/appsec"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/botman"
 	"github.com/akamai/cli-terraform/pkg/templates"
 	"github.com/akamai/cli-terraform/pkg/tools"
 

diff --git a/pkg/providers/appsec/templates/modules-activate-security-versions.tmpl b/pkg/providers/appsec/templates/modules-activate-security-versions.tmpl
@@ -2,7 +2,7 @@ terraform {
     required_providers {
         akamai = {
             source = "akamai/akamai"
-            version = ">= 3.5.0"
+            version = ">= 6.0.0"
         }
     }
     required_version = ">= 1.0"

diff --git a/pkg/providers/appsec/templates/modules-security-versions.tmpl b/pkg/providers/appsec/templates/modules-security-versions.tmpl
@@ -2,7 +2,7 @@ terraform {
     required_providers {
         akamai = {
             source = "akamai/akamai"
-            version = ">= 3.5.0"
+            version = ">= 6.0.0"
         }
     }
     required_version = ">= 1.0"

diff --git a/pkg/providers/appsec/templates/versions.tmpl b/pkg/providers/appsec/templates/versions.tmpl
@@ -2,7 +2,7 @@ terraform {
     required_providers {
         akamai = {
             source = "akamai/akamai"
-            version = ">= 3.5.0"
+            version = ">= 6.0.0"
         }
     }
     required_version = ">= 1.0"

diff --git a/pkg/providers/appsec/testdata/ase-botman/appsec-versions.tf b/pkg/providers/appsec/testdata/ase-botman/appsec-versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 3.5.0"
+      version = ">= 6.0.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/appsec/testdata/ase-botman/modules/activate-security/versions.tf b/pkg/providers/appsec/testdata/ase-botman/modules/activate-security/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 3.5.0"
+      version = ">= 6.0.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/appsec/testdata/ase-botman/modules/security/versions.tf b/pkg/providers/appsec/testdata/ase-botman/modules/security/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 3.5.0"
+      version = ">= 6.0.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/appsec/testdata/ase/appsec-versions.tf b/pkg/providers/appsec/testdata/ase/appsec-versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 3.5.0"
+      version = ">= 6.0.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/appsec/testdata/ase/modules/activate-security/versions.tf b/pkg/providers/appsec/testdata/ase/modules/activate-security/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 3.5.0"
+      version = ">= 6.0.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/appsec/testdata/ase/modules/security/versions.tf b/pkg/providers/appsec/testdata/ase/modules/security/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 3.5.0"
+      version = ">= 6.0.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/appsec/testdata/tcwest/appsec-versions.tf b/pkg/providers/appsec/testdata/tcwest/appsec-versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 3.5.0"
+      version = ">= 6.0.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/appsec/testdata/tcwest/modules/activate-security/versions.tf b/pkg/providers/appsec/testdata/tcwest/modules/activate-security/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 3.5.0"
+      version = ">= 6.0.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/appsec/testdata/tcwest/modules/security/versions.tf b/pkg/providers/appsec/testdata/tcwest/modules/security/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     akamai = {
       source  = "akamai/akamai"
-      version = ">= 3.5.0"
+      version = ">= 6.0.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/pkg/providers/clientlists/create_clientlist.go b/pkg/providers/clientlists/create_clientlist.go
@@ -10,7 +10,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/clientlists"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/clientlists"
 	"github.com/akamai/cli-terraform/pkg/edgegrid"
 	"github.com/akamai/cli-terraform/pkg/templates"
 	"github.com/akamai/cli-terraform/pkg/tools"

diff --git a/pkg/providers/clientlists/create_clientlist_test.go b/pkg/providers/clientlists/create_clientlist_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/clientlists"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/clientlists"
 	"github.com/akamai/cli-terraform/pkg/templates"
 	"github.com/akamai/cli/pkg/terminal"
 	"github.com/stretchr/testify/mock"

diff --git a/pkg/providers/cloudlets/create_policy.go b/pkg/providers/cloudlets/create_policy.go
@@ -11,8 +11,8 @@ import (
 	"sort"
 	"text/template"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/cloudlets"
-	v3 "github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/cloudlets/v3"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/cloudlets"
+	v3 "github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/cloudlets/v3"
 	"github.com/akamai/cli-terraform/pkg/edgegrid"
 	"github.com/akamai/cli-terraform/pkg/templates"
 	"github.com/akamai/cli-terraform/pkg/tools"

diff --git a/pkg/providers/cloudlets/create_policy_test.go b/pkg/providers/cloudlets/create_policy_test.go
@@ -11,8 +11,8 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/cloudlets"
-	v3 "github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/cloudlets/v3"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/cloudlets"
+	v3 "github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/cloudlets/v3"
 	"github.com/akamai/cli-terraform/pkg/templates"
 	"github.com/akamai/cli-terraform/pkg/tools"
 	"github.com/akamai/cli/pkg/terminal"

diff --git a/pkg/providers/cloudwrapper/create_configuration.go b/pkg/providers/cloudwrapper/create_configuration.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/cloudwrapper"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/cloudwrapper"
 	"github.com/akamai/cli-terraform/pkg/edgegrid"
 	"github.com/akamai/cli-terraform/pkg/templates"
 	"github.com/akamai/cli-terraform/pkg/tools"

diff --git a/pkg/providers/cloudwrapper/create_configuration_test.go b/pkg/providers/cloudwrapper/create_configuration_test.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/cloudwrapper"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/cloudwrapper"
 	"github.com/akamai/cli-terraform/pkg/templates"
 	"github.com/akamai/cli-terraform/pkg/tools"
 	"github.com/akamai/cli/pkg/terminal"

diff --git a/pkg/providers/cps/create_cps.go b/pkg/providers/cps/create_cps.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/cps"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/cps"
 	"github.com/akamai/cli-terraform/pkg/edgegrid"
 	"github.com/akamai/cli-terraform/pkg/templates"
 	"github.com/akamai/cli-terraform/pkg/tools"
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ( @@
     	"fmt"
     	"os"
-    	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v7/pkg/session"
+    	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/session"
     	"github.com/urfave/cli/v2"
     )
@@ Expand Down @@