Align naming conventions with AWS CLI

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [main]
+    branches: [main, develop]
   pull_request:
-    branches: [main]
+    branches: [main, develop]
 
 permissions:
   contents: read

custom/apigateway/httpapis/dao.go → custom/apigateway/http-apis/dao.go

@@ -22,7 +22,7 @@ type HttpAPIDAO struct {
 func NewHttpAPIDAO(ctx context.Context) (dao.DAO, error) {
 	cfg, err := appaws.NewConfig(ctx)
 	if err != nil {
-		return nil, apperrors.Wrap(err, "new apigateway/httpapis dao")
+		return nil, apperrors.Wrap(err, "new apigateway/http-apis dao")
 	}
 	return &HttpAPIDAO{
 		BaseDAO: dao.NewBaseDAO("apigateway", "http-apis"),

custom/apigateway/restapis/dao.go → custom/apigateway/rest-apis/dao.go

@@ -22,7 +22,7 @@ type RestAPIDAO struct {
 func NewRestAPIDAO(ctx context.Context) (dao.DAO, error) {
 	cfg, err := appaws.NewConfig(ctx)
 	if err != nil {
-		return nil, apperrors.Wrap(err, "new apigateway/restapis dao")
+		return nil, apperrors.Wrap(err, "new apigateway/rest-apis dao")
 	}
 	return &RestAPIDAO{
 		BaseDAO: dao.NewBaseDAO("apigateway", "rest-apis"),

custom/apigateway/stagesv2/dao.go → custom/apigateway/stages-v2/dao.go

@@ -23,7 +23,7 @@ type StageV2DAO struct {
 func NewStageV2DAO(ctx context.Context) (dao.DAO, error) {
 	cfg, err := appaws.NewConfig(ctx)
 	if err != nil {
-		return nil, apperrors.Wrap(err, "new apigateway/stagesv2 dao")
+		return nil, apperrors.Wrap(err, "new apigateway/stages-v2 dao")
 	}
 	return &StageV2DAO{
 		BaseDAO: dao.NewBaseDAO("apigateway", "stages-v2"),

custom/appsync/datasources/dao.go → custom/appsync/data-sources/dao.go

@@ -22,7 +22,7 @@ type DataSourceDAO struct {
 func NewDataSourceDAO(ctx context.Context) (dao.DAO, error) {
 	cfg, err := appaws.NewConfig(ctx)
 	if err != nil {
-		return nil, apperrors.Wrap(err, "new appsync/datasources dao")
+		return nil, apperrors.Wrap(err, "new appsync/data-sources dao")
 	}
 	return &DataSourceDAO{
 		BaseDAO: dao.NewBaseDAO("appsync", "data-sources"),

custom/appsync/graphqlapis/dao.go → custom/appsync/graphql-apis/dao.go

@@ -21,7 +21,7 @@ type GraphQLApiDAO struct {
 func NewGraphQLApiDAO(ctx context.Context) (dao.DAO, error) {
 	cfg, err := appaws.NewConfig(ctx)
 	if err != nil {
-		return nil, apperrors.Wrap(err, "new appsync/graphqlapis dao")
+		return nil, apperrors.Wrap(err, "new appsync/graphql-apis dao")
 	}
 	return &GraphQLApiDAO{
 		BaseDAO: dao.NewBaseDAO("appsync", "graphql-apis"),

custom/athena/queryexecutions/dao.go → custom/athena/query-executions/dao.go

@@ -23,7 +23,7 @@ type QueryExecutionDAO struct {
 func NewQueryExecutionDAO(ctx context.Context) (dao.DAO, error) {
 	cfg, err := appaws.NewConfig(ctx)
 	if err != nil {
-		return nil, apperrors.Wrap(err, "new athena/queryexecutions dao")
+		return nil, apperrors.Wrap(err, "new athena/query-executions dao")
 	}
 	return &QueryExecutionDAO{
 		BaseDAO: dao.NewBaseDAO("athena", "query-executions"),

custom/batch/computeenvironments/dao.go → custom/batch/compute-environments/dao.go

@@ -22,7 +22,7 @@ type ComputeEnvironmentDAO struct {
 func NewComputeEnvironmentDAO(ctx context.Context) (dao.DAO, error) {
 	cfg, err := appaws.NewConfig(ctx)
 	if err != nil {
-		return nil, apperrors.Wrap(err, "new batch/computeenvironments dao")
+		return nil, apperrors.Wrap(err, "new batch/compute-environments dao")
 	}
 	return &ComputeEnvironmentDAO{
 		BaseDAO: dao.NewBaseDAO("batch", "compute-environments"),

custom/batch/jobdefinitions/dao.go → custom/batch/job-definitions/dao.go

@@ -23,7 +23,7 @@ type JobDefinitionDAO struct {
 func NewJobDefinitionDAO(ctx context.Context) (dao.DAO, error) {
 	cfg, err := appaws.NewConfig(ctx)
 	if err != nil {
-		return nil, apperrors.Wrap(err, "new batch/jobdefinitions dao")
+		return nil, apperrors.Wrap(err, "new batch/job-definitions dao")
 	}
 	return &JobDefinitionDAO{
 		BaseDAO: dao.NewBaseDAO("batch", "job-definitions"),

custom/batch/jobqueues/dao.go → custom/batch/job-queues/dao.go

@@ -22,7 +22,7 @@ type JobQueueDAO struct {
 func NewJobQueueDAO(ctx context.Context) (dao.DAO, error) {
 	cfg, err := appaws.NewConfig(ctx)
 	if err != nil {
-		return nil, apperrors.Wrap(err, "new batch/jobqueues dao")
+		return nil, apperrors.Wrap(err, "new batch/job-queues dao")
 	}
 	return &JobQueueDAO{
 		BaseDAO: dao.NewBaseDAO("batch", "job-queues"),

custom/bedrockagent/agents/dao.go → custom/bedrock-agent/agents/dao.go

@@ -22,7 +22,7 @@ type AgentDAO struct {
 func NewAgentDAO(ctx context.Context) (dao.DAO, error) {
 	cfg, err := appaws.NewConfig(ctx)
 	if err != nil {
-		return nil, apperrors.Wrap(err, "new bedrockagent/agents dao")
+		return nil, apperrors.Wrap(err, "new bedrock-agent/agents dao")
 	}
 	return &AgentDAO{
 		BaseDAO: dao.NewBaseDAO("bedrock-agent", "agents"),