Replace membership with authorization (#65)

* Replace membership with authorization

* Reorder fields

---------

Co-authored-by: Henrique Santos <[email protected]>

Author: hcsa73

docs/stackit_config_set.md

@@ -29,11 +29,11 @@ stackit config set [flags]
 ### Options
 
 ```
+      --authorization-custom-endpoint string      Authorization custom endpoint
       --dns-custom-endpoint string                DNS custom endpoint
   -h, --help                                      Help for "stackit config set"
       --logme-custom-endpoint string              LogMe custom endpoint
       --mariadb-custom-endpoint string            MariaDB custom endpoint
-      --membership-custom-endpoint string         Membership custom endpoint
       --mongodbflex-custom-endpoint string        MongoDB Flex custom endpoint
       --opensearch-custom-endpoint string         OpenSearch custom endpoint
       --postgresflex-custom-endpoint string       PostgreSQL Flex custom endpoint

docs/stackit_config_unset.md

@@ -27,11 +27,11 @@ stackit config unset [flags]
 
 ```
       --async                              Configuration option to run commands asynchronously
+      --authorization-custom-endpoint      Authorization custom endpoint
       --dns-custom-endpoint                DNS custom endpoint
   -h, --help                               Help for "stackit config unset"
       --logme-custom-endpoint              LogMe custom endpoint
       --mariadb-custom-endpoint            MariaDB custom endpoint
-      --membership-custom-endpoint         Membership custom endpoint
       --mongodbflex-custom-endpoint        MongoDB Flex custom endpoint
       --opensearch-custom-endpoint         OpenSearch custom endpoint
       --output-format                      Output format

docs/stackit_mongodbflex_instance_create.md

@@ -35,7 +35,7 @@ stackit mongodbflex instance create [flags]
       --ram int                  Amount of RAM (in GB)
       --storage-class string     Storage class (default "premium-perf2-mongodb")
       --storage-size int         Storage size (in GB) (default 10)
-      --type string              Instance type, one of ["Replica" "Sharded" "Single"] (default "Replica")
+      --type string              Instance type, one of ["Single" "Replica" "Sharded"] (default "Replica")
       --version string           MongoDB version. Defaults to the latest version available
 ```
 

go.mod

@@ -11,8 +11,8 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.18.2
 	github.com/stackitcloud/stackit-sdk-go/core v0.7.7
+	github.com/stackitcloud/stackit-sdk-go/services/authorization v0.1.0
 	github.com/stackitcloud/stackit-sdk-go/services/dns v0.8.2
-	github.com/stackitcloud/stackit-sdk-go/services/membership v0.3.4
 	github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.10.3
 	github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.9.2
 	github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.9.1

go.sum

@@ -79,14 +79,14 @@ github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ=
 github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
 github.com/stackitcloud/stackit-sdk-go/core v0.7.7 h1:w1T8I2ERT5xPHXS+UV9maSseK8tyUJQjzS21hhRSWjU=
 github.com/stackitcloud/stackit-sdk-go/core v0.7.7/go.mod h1:nfC2Tbjd73Ivn8wEp3lvG/dmiXHgl6QX+HY2Ih3aGgw=
+github.com/stackitcloud/stackit-sdk-go/services/authorization v0.1.0 h1:FkOaz7ZutvteismzVHsabddg5GLWvRCA9jEzWH1/V9Y=
+github.com/stackitcloud/stackit-sdk-go/services/authorization v0.1.0/go.mod h1:n2iI0NZdawwkGt3nqm09l8kSJ3MGgLCCOWdVzanEPzA=
 github.com/stackitcloud/stackit-sdk-go/services/dns v0.8.2 h1:Wj3A+BAitSK74dRMxEGoKU1itEZmjwrAECT/CgsEJOQ=
 github.com/stackitcloud/stackit-sdk-go/services/dns v0.8.2/go.mod h1:RYRnST/3Kz5GmxMmFvsaYFblfZ/LMxw8r9DNfnRhX/4=
 github.com/stackitcloud/stackit-sdk-go/services/logme v0.10.0 h1:5+X0sKPdnLT/a1Jt73YphecQpPEOpd6TY6XdK0zGqP4=
 github.com/stackitcloud/stackit-sdk-go/services/logme v0.10.0/go.mod h1:e/I/8wJEqLdzdEgsGh7UbwbMMMNL5F1os25K+vQSzOc=
 github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.10.0 h1:WxvySRZfkecOVjrpK3NiyqPL9YWKSpdBbIf55Y5HlNs=
 github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.10.0/go.mod h1:GQ+UyuUOANO/kQOIhqLmMYRH34NbZShMrfmUY6hTSjo=
-github.com/stackitcloud/stackit-sdk-go/services/membership v0.3.4 h1:0OT/UBP55/GPMm9Tks9Uhb+PvP/2zI6ZUySfh7px+kY=
-github.com/stackitcloud/stackit-sdk-go/services/membership v0.3.4/go.mod h1:6ovfcQJ96ivkBpSI933lVl2a/SWprpVGoK6YNKycLps=
 github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.10.3 h1:M7ALIg1tE8MFLLw9Um0iyvdBgIhl83tJ0sWRjP7YqMM=
 github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.10.3/go.mod h1:LWfUBjGQWF3SZivQdUdAC/WxJkx8ImJKy5GFMV3tXHY=
 github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.9.2 h1:dwZ1NDD+AxTaZqAeR/0PY7yt32dbABhQH1Vsnt8A+hg=

internal/cmd/config/set/set.go

@@ -18,10 +18,10 @@ import (
 const (
 	sessionTimeLimitFlag = "session-time-limit"
 
+	authorizationCustomEndpointFlag   = "authorization-custom-endpoint"
 	dnsCustomEndpointFlag             = "dns-custom-endpoint"
 	logMeCustomEndpointFlag           = "logme-custom-endpoint"
 	mariaDBCustomEndpointFlag         = "mariadb-custom-endpoint"
-	membershipCustomEndpointFlag      = "membership-custom-endpoint"
 	mongoDBFlexCustomEndpointFlag     = "mongodbflex-custom-endpoint"
 	openSearchCustomEndpointFlag      = "opensearch-custom-endpoint"
 	postgresFlexCustomEndpointFlag    = "postgresflex-custom-endpoint"
@@ -90,10 +90,10 @@ func NewCmd() *cobra.Command {
 func configureFlags(cmd *cobra.Command) {
 	cmd.Flags().String(sessionTimeLimitFlag, "", "Maximum time before authentication is required again. Can't be larger than 24h. Examples: 3h, 5h30m40s (BETA: currently values greater than 2h have no effect)")
 
+	cmd.Flags().String(authorizationCustomEndpointFlag, "", "Authorization custom endpoint")
 	cmd.Flags().String(dnsCustomEndpointFlag, "", "DNS custom endpoint")
 	cmd.Flags().String(logMeCustomEndpointFlag, "", "LogMe custom endpoint")
 	cmd.Flags().String(mariaDBCustomEndpointFlag, "", "MariaDB custom endpoint")
-	cmd.Flags().String(membershipCustomEndpointFlag, "", "Membership custom endpoint")
 	cmd.Flags().String(mongoDBFlexCustomEndpointFlag, "", "MongoDB Flex custom endpoint")
 	cmd.Flags().String(openSearchCustomEndpointFlag, "", "OpenSearch custom endpoint")
 	cmd.Flags().String(postgresFlexCustomEndpointFlag, "", "PostgreSQL Flex custom endpoint")
@@ -103,14 +103,14 @@ func configureFlags(cmd *cobra.Command) {
 	cmd.Flags().String(serviceAccountCustomEndpointFlag, "", "Service Account custom endpoint")
 	cmd.Flags().String(skeCustomEndpointFlag, "", "SKE custom endpoint")
 
-	err := viper.BindPFlag(config.DNSCustomEndpointKey, cmd.Flags().Lookup(dnsCustomEndpointFlag))
+	err := viper.BindPFlag(config.AuthorizationCustomEndpointKey, cmd.Flags().Lookup(authorizationCustomEndpointFlag))
+	cobra.CheckErr(err)
+	err = viper.BindPFlag(config.DNSCustomEndpointKey, cmd.Flags().Lookup(dnsCustomEndpointFlag))
 	cobra.CheckErr(err)
 	err = viper.BindPFlag(config.LogMeCustomEndpointKey, cmd.Flags().Lookup(logMeCustomEndpointFlag))
 	cobra.CheckErr(err)
 	err = viper.BindPFlag(config.MariaDBCustomEndpointKey, cmd.Flags().Lookup(mariaDBCustomEndpointFlag))
 	cobra.CheckErr(err)
-	err = viper.BindPFlag(config.MembershipCustomEndpointKey, cmd.Flags().Lookup(membershipCustomEndpointFlag))
-	cobra.CheckErr(err)
 	err = viper.BindPFlag(config.MongoDBFlexCustomEndpointKey, cmd.Flags().Lookup(mongoDBFlexCustomEndpointFlag))
 	cobra.CheckErr(err)
 	err = viper.BindPFlag(config.OpenSearchCustomEndpointKey, cmd.Flags().Lookup(openSearchCustomEndpointFlag))

internal/cmd/config/unset/unset.go

@@ -18,10 +18,10 @@ const (
 	outputFormatFlag = globalflags.OutputFormatFlag
 	projectIdFlag    = globalflags.ProjectIdFlag
 
+	authorizationCustomEndpointFlag   = "authorization-custom-endpoint"
 	dnsCustomEndpointFlag             = "dns-custom-endpoint"
 	logMeCustomEndpointFlag           = "logme-custom-endpoint"
 	mariaDBCustomEndpointFlag         = "mariadb-custom-endpoint"
-	membershipCustomEndpointFlag      = "membership-custom-endpoint"
 	mongoDBFlexCustomEndpointFlag     = "mongodbflex-custom-endpoint"
 	openSearchCustomEndpointFlag      = "opensearch-custom-endpoint"
 	postgresFlexCustomEndpointFlag    = "postgresflex-custom-endpoint"
@@ -37,10 +37,10 @@ type inputModel struct {
 	OutputFormat bool
 	ProjectId    bool
 
+	AuthorizationCustomEndpoint   bool
 	DNSCustomEndpoint             bool
 	LogMeCustomEndpoint           bool
 	MariaDBCustomEndpoint         bool
-	MembershipCustomEndpoint      bool
 	MongoDBFlexCustomEndpoint     bool
 	OpenSearchCustomEndpoint      bool
 	PostgresFlexCustomEndpoint    bool
@@ -81,6 +81,9 @@ func NewCmd() *cobra.Command {
 				viper.Set(config.ProjectIdKey, "")
 			}
 
+			if model.AuthorizationCustomEndpoint {
+				viper.Set(config.AuthorizationCustomEndpointKey, "")
+			}
 			if model.DNSCustomEndpoint {
 				viper.Set(config.DNSCustomEndpointKey, "")
 			}
@@ -90,9 +93,6 @@ func NewCmd() *cobra.Command {
 			if model.MariaDBCustomEndpoint {
 				viper.Set(config.MariaDBCustomEndpointKey, "")
 			}
-			if model.MembershipCustomEndpoint {
-				viper.Set(config.MembershipCustomEndpointKey, "")
-			}
 			if model.MongoDBFlexCustomEndpoint {
 				viper.Set(config.MongoDBFlexCustomEndpointKey, "")
 			}
@@ -134,10 +134,10 @@ func configureFlags(cmd *cobra.Command) {
 	cmd.Flags().Bool(projectIdFlag, false, "Project ID")
 	cmd.Flags().Bool(outputFormatFlag, false, "Output format")
 
+	cmd.Flags().Bool(authorizationCustomEndpointFlag, false, "Authorization custom endpoint")
 	cmd.Flags().Bool(dnsCustomEndpointFlag, false, "DNS custom endpoint")
 	cmd.Flags().Bool(logMeCustomEndpointFlag, false, "LogMe custom endpoint")
 	cmd.Flags().Bool(mariaDBCustomEndpointFlag, false, "MariaDB custom endpoint")
-	cmd.Flags().Bool(membershipCustomEndpointFlag, false, "Membership custom endpoint")
 	cmd.Flags().Bool(mongoDBFlexCustomEndpointFlag, false, "MongoDB Flex custom endpoint")
 	cmd.Flags().Bool(openSearchCustomEndpointFlag, false, "OpenSearch custom endpoint")
 	cmd.Flags().Bool(postgresFlexCustomEndpointFlag, false, "PostgreSQL Flex custom endpoint")
@@ -154,10 +154,10 @@ func parseInput(cmd *cobra.Command) *inputModel {
 		OutputFormat: flags.FlagToBoolValue(cmd, outputFormatFlag),
 		ProjectId:    flags.FlagToBoolValue(cmd, projectIdFlag),
 
+		AuthorizationCustomEndpoint:   flags.FlagToBoolValue(cmd, authorizationCustomEndpointFlag),
 		DNSCustomEndpoint:             flags.FlagToBoolValue(cmd, dnsCustomEndpointFlag),
 		LogMeCustomEndpoint:           flags.FlagToBoolValue(cmd, logMeCustomEndpointFlag),
 		MariaDBCustomEndpoint:         flags.FlagToBoolValue(cmd, mariaDBCustomEndpointFlag),
-		MembershipCustomEndpoint:      flags.FlagToBoolValue(cmd, membershipCustomEndpointFlag),
 		MongoDBFlexCustomEndpoint:     flags.FlagToBoolValue(cmd, mongoDBFlexCustomEndpointFlag),
 		OpenSearchCustomEndpoint:      flags.FlagToBoolValue(cmd, openSearchCustomEndpointFlag),
 		PostgresFlexCustomEndpoint:    flags.FlagToBoolValue(cmd, postgresFlexCustomEndpointFlag),

internal/cmd/organization/member/add/add.go

@@ -9,11 +9,11 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/services/membership/client"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/services/authorization/client"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/utils"
 
 	"github.com/spf13/cobra"
-	"github.com/stackitcloud/stackit-sdk-go/services/membership"
+	"github.com/stackitcloud/stackit-sdk-go/services/authorization"
 )
 
 const (
@@ -107,10 +107,10 @@ func parseInput(cmd *cobra.Command, inputArgs []string) (*inputModel, error) {
 	}, nil
 }
 
-func buildRequest(ctx context.Context, model *inputModel, apiClient *membership.APIClient) membership.ApiAddMembersRequest {
+func buildRequest(ctx context.Context, model *inputModel, apiClient *authorization.APIClient) authorization.ApiAddMembersRequest {
 	req := apiClient.AddMembers(ctx, *model.OrganizationId)
-	req = req.AddMembersPayload(membership.AddMembersPayload{
-		Members: utils.Ptr([]membership.Member{
+	req = req.AddMembersPayload(authorization.AddMembersPayload{
+		Members: utils.Ptr([]authorization.Member{
 			{
 				Subject: utils.Ptr(model.Subject),
 				Role:    model.Role,

internal/cmd/organization/member/add/add_test.go

@@ -9,13 +9,13 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/stackitcloud/stackit-sdk-go/services/membership"
+	"github.com/stackitcloud/stackit-sdk-go/services/authorization"
 )
 
 type testCtxKey struct{}
 
 var testCtx = context.WithValue(context.Background(), testCtxKey{}, "foo")
-var testClient = &membership.APIClient{}
+var testClient = &authorization.APIClient{}
 var testOrganizationID = "some-organization-id"
 var testSubject = "[email protected]"
 var testRole = "reader"
@@ -54,10 +54,10 @@ func fixtureInputModel(mods ...func(model *inputModel)) *inputModel {
 	return model
 }
 
-func fixtureRequest(mods ...func(request *membership.ApiAddMembersRequest)) membership.ApiAddMembersRequest {
+func fixtureRequest(mods ...func(request *authorization.ApiAddMembersRequest)) authorization.ApiAddMembersRequest {
 	request := testClient.AddMembers(testCtx, testOrganizationID)
-	request = request.AddMembersPayload(membership.AddMembersPayload{
-		Members: utils.Ptr([]membership.Member{
+	request = request.AddMembersPayload(authorization.AddMembersPayload{
+		Members: utils.Ptr([]authorization.Member{
 			{
 				Subject: &testSubject,
 				Role:    &testRole,
@@ -178,7 +178,7 @@ func TestBuildRequest(t *testing.T) {
 	tests := []struct {
 		description     string
 		model           *inputModel
-		expectedRequest membership.ApiAddMembersRequest
+		expectedRequest authorization.ApiAddMembersRequest
 	}{
 		{
 			description:     "base",

internal/cmd/organization/member/list/list.go

@@ -11,11 +11,11 @@ import (
 	"github.com/stackitcloud/stackit-cli/internal/pkg/examples"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/flags"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/globalflags"
-	"github.com/stackitcloud/stackit-cli/internal/pkg/services/membership/client"
+	"github.com/stackitcloud/stackit-cli/internal/pkg/services/authorization/client"
 	"github.com/stackitcloud/stackit-cli/internal/pkg/tables"
 
 	"github.com/spf13/cobra"
-	"github.com/stackitcloud/stackit-sdk-go/services/membership"
+	"github.com/stackitcloud/stackit-sdk-go/services/authorization"
 )
 
 const (
@@ -122,15 +122,15 @@ func parseInput(cmd *cobra.Command) (*inputModel, error) {
 	}, nil
 }
 
-func buildRequest(ctx context.Context, model *inputModel, apiClient *membership.APIClient) membership.ApiListMembersRequest {
+func buildRequest(ctx context.Context, model *inputModel, apiClient *authorization.APIClient) authorization.ApiListMembersRequest {
 	req := apiClient.ListMembers(ctx, organizationResourceType, *model.OrganizationId)
 	if model.Subject != nil {
 		req = req.Subject(*model.Subject)
 	}
 	return req
 }
 
-func outputResult(cmd *cobra.Command, model *inputModel, members []membership.Member) error {
+func outputResult(cmd *cobra.Command, model *inputModel, members []authorization.Member) error {
 	sortFn := func(i, j int) bool {
 		switch model.SortBy {
 		case "subject":