DXE-4220 Merge pull request #77 from akamai/release/v1.18.0

Release/v1.18.0

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Release Notes
 
+## Version 1.18.0 (October 10, 2024)
+
+### Features/Enhancements
+
+* Appsec
+  * Resource `akamai_appsec_match_target` created only if target product is not an AAP account
+  * Resource `akamai_appsec_wap_selected_hostnames` exported for AAP accounts
+
+* Identity and Access Management (IAM)
+  * Added support for generation of `enable_mfa` and `user_notifications` attributes when exporting `akamai_iam_user` configuration
+  * Added `allowlist` subcommand to command `export-iam` that exports terraform configuration files for account's IP allowlist and CIDR blocks
+  * Modified `all` subcommand for `export-iam` command to export account's IP allowlist and CIDR blocks details
+
+### Bug fixes
+
+* PAPI
+  * Fixed an issue with property export where the hostname cnameTo begins with a number or contains a space.
+
 ## Version 1.17.0 (September 04, 2024)
 
 ### Features/Enhancements

Makefile

@@ -4,6 +4,13 @@ GOTEST = $(GOCMD) test
 GOBUILD = $(GOCMD) build
 M = $(shell echo ">")
 
+# Until v0.25.0 is not fixed, we have to use previous version. To install it, we must enable module aware mode.
+GOIMPORTS = $(BIN)/goimports
+GOIMPORTS_VERSION = v0.24.0
+# Rule to install goimports with version pinning
+$(GOIMPORTS): | $(BIN) ; $(info $(M) Installing goimports $(GOIMPORTS_VERSION)...)
+	$Q env GO111MODULE=on GOBIN=$(BIN) $(GOCMD) install golang.org/x/tools/cmd/goimports@$(GOIMPORTS_VERSION)
+
 $(BIN):
 	@mkdir -p $@
 $(BIN)/%: | $(BIN) ; $(info $(M) Installing $(PACKAGE)...)
@@ -12,9 +19,6 @@ $(BIN)/%: | $(BIN) ; $(info $(M) Installing $(PACKAGE)...)
 		|| ret=$$?; \
 	   rm -rf $$tmp ; exit $$ret
 
-GOIMPORTS = $(BIN)/goimports
-$(BIN)/goimports: PACKAGE=golang.org/x/tools/cmd/goimports
-
 GOCOV = $(BIN)/gocov
 $(BIN)/gocov: PACKAGE=github.com/axw/gocov/...
 

README.md

@@ -329,7 +329,8 @@ $ akamai terraform [global flags] export-edgeworker [command flags] <edgeworker_
    akamai terraform [global flags] export-iam [subcommand]
 
 Subcommands:
-    all                     Exports all available Terraform Users, Groups and Roles
+    all                     Exports all available Terraform Users, Groups, Roles, IP Allowlist and CIDR block resources
+    allowlist               Exports Terraform IP Allowlist and CIDR block resources
     group [group id]        Exports group by id with relevant users and their roles
     role [role id]          Exports role by id with relevant users and their groups
     user [user's email]     Exports user by email with relevant user's groups and roles

build/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.0-experimental
 # This script was copied from 'terraform-provider-akamai'
-FROM golang:1.21.12-alpine3.20
+FROM golang:1.21.12-alpine3.19
 ENV PROVIDER_VERSION="1.0.0" \
     GO111MODULE="on" \
     CGO_ENABLED=0 \
@@ -11,7 +11,7 @@ ENV PROVIDER_VERSION="1.0.0" \
 ARG SSH_PRV_KEY
 ARG SSH_PUB_KEY
 ARG SSH_KNOWN_HOSTS
-ARG TERRAFORM_VERSION="1.4.6"
+ARG TERRAFORM_VERSION="1.9.5"
 WORKDIR $GOPATH/src/github.com/akamai
 
 RUN apk add --update git bash sudo openssh gcc musl-dev openssl-dev ca-certificates unzip curl make && \

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/v8=../edgegrid;
+                                   go mod edit -replace github.com/akamai/AkamaiOPEN-edgegrid-golang/v9=../edgegrid;
                                    go mod edit -replace github.com/akamai/cli=../cli;
                                    go mod tidy'
 

cli.json

@@ -5,7 +5,7 @@
   "commands": [
     {
       "name": "terraform",
-      "version": "1.17.0",
+      "version": "1.18.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,

cli/cli.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/session"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v9/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.17.0"
+	Version = "1.18.0"
 )
 
 // Run initializes the cli and runs it

cli/cli_test.go

@@ -7,7 +7,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v8/pkg/session"
+	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v9/pkg/session"
 	"github.com/akamai/cli/pkg/log"
 	"github.com/stretchr/testify/assert"
 	"github.com/urfave/cli/v2"

go.mod

@@ -3,10 +3,10 @@ module github.com/akamai/cli-terraform
 go 1.21
 
 require (
-	github.com/akamai/AkamaiOPEN-edgegrid-golang/v8 v8.4.0
-	github.com/akamai/cli v1.5.6
-	github.com/fatih/color v1.13.0
-	github.com/hashicorp/hcl/v2 v2.11.1
+	github.com/akamai/AkamaiOPEN-edgegrid-golang/v9 v9.0.0
+	github.com/akamai/cli v1.6.0
+	github.com/fatih/color v1.16.0
+	github.com/hashicorp/hcl/v2 v2.21.0
 	github.com/jinzhu/copier v0.4.0
 	github.com/shirou/gopsutil v2.20.4+incompatible
 	github.com/stretchr/testify v1.8.4
@@ -18,42 +18,46 @@ require (
 	github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/StackExchange/wmi v1.2.1 // indirect
-	github.com/agext/levenshtein v1.2.1 // indirect
+	github.com/agext/levenshtein v1.2.3 // indirect
 	github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
 	github.com/apex/log v1.9.0 // indirect
-	github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
+	github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496 // indirect
 	github.com/briandowns/spinner v1.23.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/go-ozzo/ozzo-validation/v4 v4.3.0 // indirect
-	github.com/google/go-cmp v0.3.1 // indirect
-	github.com/google/uuid v1.1.1 // indirect
+	github.com/go-test/deep v1.1.0 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/kr/pretty v0.2.1 // indirect
-	github.com/mattn/go-colorable v0.1.9 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 // indirect
+	github.com/mitchellh/go-wordwrap v1.0.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rogpeppe/go-internal v1.9.0 // indirect
 	github.com/russross/blackfriday/v2 v2.0.1 // indirect
 	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
-	github.com/spf13/cast v1.3.1 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
 	github.com/stretchr/objx v0.5.0 // indirect
-	github.com/zclconf/go-cty v1.8.0 // indirect
+	github.com/zclconf/go-cty v1.14.4 // indirect
 	go.uber.org/ratelimit v0.2.0 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/term v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/mod v0.17.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/term v0.20.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
-	gopkg.in/ini.v1 v1.66.4 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
-//replace github.com/akamai/AkamaiOPEN-edgegrid-golang/v8 => ../akamaiopen-edgegrid-golang
+//replace github.com/akamai/AkamaiOPEN-edgegrid-golang/v9 => ../akamaiopen-edgegrid-golang
 //replace github.com/akamai/cli => ../cli