From e8f926fc8d3b86f6530a9ef8c311ff29a04633c5 Mon Sep 17 00:00:00 2001
From: Yusuke Tsutsumi <yusuke@tsutsumi.io>
Date: Sat, 1 Nov 2025 12:50:35 -0700
Subject: [PATCH] fix: upgrade aep-lib-go

upgrade aep-lib-go to pick up fixes.
---
 debug.go                                | 47 +++++++++++++++++++++++++
 go.mod                                  |  4 +--
 go.sum                                  |  2 ++
 internal/service/resource_definition.go |  6 +++-
 4 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 debug.go

diff --git a/debug.go b/debug.go
new file mode 100644
index 0000000..a76c7c5
--- /dev/null
+++ b/debug.go
@@ -0,0 +1,47 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/aep-dev/aep-lib-go/pkg/api"
+	"github.com/aep-dev/aep-lib-go/pkg/openapi"
+)
+
+func main() {
+	a := &api.API{
+		Name:      "test",
+		ServerURL: "https://api.example.com",
+		Resources: map[string]*api.Resource{
+			"project": {
+				Singular: "project",
+				Plural:   "projects",
+				Parents:  []string{},
+				Schema:   &openapi.Schema{},
+			},
+			"dataset": {
+				Singular: "dataset",
+				Plural:   "datasets",
+				Parents:  []string{"project"},
+				Schema:   &openapi.Schema{},
+			},
+		},
+	}
+
+	err := api.AddImplicitFieldsAndValidate(a)
+	if err != nil {
+		panic(err)
+	}
+
+	dataset := a.Resources["dataset"]
+	patternElems := dataset.PatternElems()
+	fmt.Printf("Dataset PatternElems: %+v\n", patternElems)
+
+	// Simulate the flag creation logic
+	i := 1
+	for i < len(patternElems)-1 {
+		p := patternElems[i]
+		flagName := p[1 : len(p)-1]
+		fmt.Printf("Would create flag: --%s\n", flagName)
+		i += 2
+	}
+}
diff --git a/go.mod b/go.mod
index 8ca4601..1608026 100644
--- a/go.mod
+++ b/go.mod
@@ -1,10 +1,10 @@
 module github.com/aep-dev/aepcli
 
-go 1.22.3
+go 1.23
 
 require (
 	github.com/BurntSushi/toml v1.4.0
-	github.com/aep-dev/aep-lib-go v0.0.0-20250514123412-03de496bdecf
+	github.com/aep-dev/aep-lib-go v0.0.0-20251011190527-4b8a96d91310
 	github.com/spf13/cobra v1.8.1
 	github.com/stretchr/testify v1.9.0
 )
diff --git a/go.sum b/go.sum
index 22d8f9b..5f74193 100644
--- a/go.sum
+++ b/go.sum
@@ -2,6 +2,8 @@ github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0
 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/aep-dev/aep-lib-go v0.0.0-20250514123412-03de496bdecf h1:fBHYtDAK2M/WAGG5cBHmewlW5XSdt9SaBASSb+KadT8=
 github.com/aep-dev/aep-lib-go v0.0.0-20250514123412-03de496bdecf/go.mod h1:YWfg3gjAGpvwFJnEQl1JjBGd0evGBKobt5wU/QxV6pA=
+github.com/aep-dev/aep-lib-go v0.0.0-20251011190527-4b8a96d91310 h1:Hp9cCdNYMYq0DkfcgEE68rIrVRBn8YcoY9mfVvo7Zug=
+github.com/aep-dev/aep-lib-go v0.0.0-20251011190527-4b8a96d91310/go.mod h1:26IeaYRvf6ObXyPm6rlqEUiH0qyFoT1Eyf8Ys2r95tg=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
diff --git a/internal/service/resource_definition.go b/internal/service/resource_definition.go
index bfcfa3e..38816b1 100644
--- a/internal/service/resource_definition.go
+++ b/internal/service/resource_definition.go
@@ -23,7 +23,11 @@ func ExecuteResourceCommand(r *api.Resource, args []string) (*http.Request, stri
 	patternElems := r.PatternElems()
 	for i < len(patternElems)-1 {
 		p := patternElems[i]
-		flagName := p[1 : len(p)-1]
+		flagName := p[1 : len(p)-1] // extract content between braces
+		// Strip "_id" suffix if present to make flag names cleaner
+		if strings.HasSuffix(flagName, "_id") {
+			flagName = strings.TrimSuffix(flagName, "_id")
+		}
 		var flagValue string
 		parents = append(parents, &flagValue)
 		c.PersistentFlags().StringVar(&flagValue, flagName, "", fmt.Sprintf("The %v of the resource", flagName))