DXE-5227 Merge pull request #96 from akamai/release/v2.3.0

Release/v2.3.0

Author: mgwoj

.gitignore

@@ -0,0 +1 @@
+bin/

CHANGELOG.md

@@ -1,5 +1,16 @@
 # RELEASE NOTES
 
+## 2.3.0 (Aug 6, 2025)
+
+### FEATURES/ENHANCEMENTS:
+
+* mTLS Keystore
+  * Added the `export-mtls-keystore <certificate_id> [<group_id>  <contract_id>]` command that generates the configuration for the
+  `akamai_mtlskeystore_client_certificate_akamai` and `akamai_mtlskeystore_client_certificate_third_party` resources.
+
+* PAPI
+  * Added support for the new rule formats `v2025-05-30` and `v2025-07-07`.
+
 ## 2.2.0 (May 28, 2025)
 
 ### FEATURES/ENHANCEMENTS:

README.md

@@ -155,6 +155,7 @@ Global Flags:
   <li><a href="#exportedgeworker">export-edgeworker</a></li>
   <li><a href="#exportiam">export-iam</a></li>
   <li><a href="#exportimaging">export-imaging</a></li>
+  <li><a href="#exportmtlskeystore">export-mtls-keystore</a></li>
   <li><a href="#exportproperty">export-property</a></li>
   <li><a href="#exportproperty-include">export-property-include</a></li>
   <li><a href="#exportzone">export-zone</a></li>
@@ -413,6 +414,24 @@ akamai terraform export-imaging "C-0N7RAC7" "my-policy-set_1234"
 | `--policy-as-hcl` (boolean) | Exports your imaging policy with rules in HCL format. | `akamai terraform export-imaging --policy-as-hcl "C-0N7RAC7" "my-policy-set_12345"` |
 | `--policy-json-dir` (string) | Sets the path to a directory in which you want to store your policy in JSON format. The default is your active directory.| `akamai terraform export-imaging --policy-json-dir "path/to/your/directory" "C-0N7RAC7" "my-policy-set_12345"` |
 
+## export‑mtls-keystore
+
+Export a Terraform configuration for your mTLS client certificate.
+ 
+> **Note:** For third-party certificates, version information is always exported without being commented out as there is no automatic rotation. You can manually update the version fields as needed before applying the configuration.
+
+### Syntax
+
+```shell
+akamai [global flags] terraform export-mtls-keystore [command flags] <certificate_id> [<group_id>  <contract_id>]
+```
+
+### Basic usage
+
+```shell
+akamai terraform export-mtls-keystore 12345
+```
+
 ## export‑property
 
 Export a Terraform configuration for your property along with its JSON-formatted rules, but without the includes. Use the [`export-property-include`](#exportproperty-include) command to export your includes.

cli.json

@@ -5,7 +5,7 @@
   "commands": [
     {
       "name": "terraform",
-      "version": "2.2.0",
+      "version": "2.3.0",
       "description": "Export selected resources for faster adoption in Terraform",
       "bin": "https://github.com/akamai/cli-terraform/releases/download/v{{.Version}}/akamai-{{.Name}}-{{.Version}}-{{.OS}}{{.Arch}}{{.BinSuffix}}",
       "auto-complete": true,

cli/cli.go

@@ -3,23 +3,21 @@ package cli
 
 import (
 	"context"
-	"errors"
 	"os"
 
 	sesslog "github.com/akamai/AkamaiOPEN-edgegrid-golang/v11/pkg/log"
 	"github.com/akamai/AkamaiOPEN-edgegrid-golang/v11/pkg/session"
 	"github.com/akamai/cli-terraform/v2/pkg/commands"
 	"github.com/akamai/cli-terraform/v2/pkg/edgegrid"
 	akacli "github.com/akamai/cli/v2/pkg/app"
-	"github.com/akamai/cli/v2/pkg/color"
 	"github.com/akamai/cli/v2/pkg/log"
 	"github.com/akamai/cli/v2/pkg/terminal"
 	"github.com/urfave/cli/v2"
 )
 
 var (
 	// Version holds current version of cli-terraform
-	Version = "2.2.0"
+	Version = "2.3.0"
 )
 
 // Run initializes the cli and runs it
@@ -33,10 +31,7 @@ func Run() error {
 		"Export selected resources for faster adoption in Terraform.",
 		Version)
 
-	cmds, err := commands.CommandLocator()
-	if err != nil {
-		return errors.New(color.RedString("An error occurred initializing commands: %s", err))
-	}
+	cmds := commands.CommandLocator()
 	if len(cmds) > 0 {
 		app.Commands = append(cmds, app.Commands...)
 	}

go.mod

@@ -3,7 +3,7 @@ module github.com/akamai/cli-terraform/v2
 go 1.23.6
 
 require (
-	github.com/akamai/AkamaiOPEN-edgegrid-golang/v11 v11.0.0
+	github.com/akamai/AkamaiOPEN-edgegrid-golang/v11 v11.1.0
 	github.com/akamai/cli/v2 v2.0.1
 	github.com/hashicorp/hcl/v2 v2.23.0
 	github.com/jinzhu/copier v0.4.0

go.sum

@@ -6,8 +6,8 @@ github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63n
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
 github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
 github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
-github.com/akamai/AkamaiOPEN-edgegrid-golang/v11 v11.0.0 h1:ot8yMzEm0Kx2LCTOzlM7zh4ASLFZ6H0iYhtIKolSujs=
-github.com/akamai/AkamaiOPEN-edgegrid-golang/v11 v11.0.0/go.mod h1:rvh3imDA6EaQi+oM/GQHkQAOHbXPKJ7EWJvfjuw141Q=
+github.com/akamai/AkamaiOPEN-edgegrid-golang/v11 v11.1.0 h1:h/33OxYLqBk0BYmEbSUy7MlvgQR/m1w1/7OJFKoPL1I=
+github.com/akamai/AkamaiOPEN-edgegrid-golang/v11 v11.1.0/go.mod h1:rvh3imDA6EaQi+oM/GQHkQAOHbXPKJ7EWJvfjuw141Q=
 github.com/akamai/cli/v2 v2.0.1 h1:K5624ReV3K12AehPF9GK/IOCRhUea1dRJoaVjj35m2k=
 github.com/akamai/cli/v2 v2.0.1/go.mod h1:FLUVPrBcP0sPEYy9HopagZWvKcAMwmJBHCe2WCiJgUM=
 github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=