Reorganize the cmd package (#35)

adobe · Apr 26, 2024 · 62170de · 62170de
1 parent ac780e7
commit 62170de
Show file tree

Hide file tree

Showing 19 changed files with 49 additions and 45 deletions.
diff --git a/cmd/admin.go b/cmd/admin.go
@@ -11,6 +11,7 @@
 package cmd
 
 import (
+	"github.com/adobe/imscli/cmd/admin"
 	"github.com/adobe/imscli/ims"
 	"github.com/spf13/cobra"
 )
@@ -26,8 +27,8 @@ This command has no effect by itself, the request needs to be specified as a sub
 `,
 	}
 	cmd.AddCommand(
-		adminProfileCmd(imsConfig),
-		adminOrganizationsCmd(imsConfig),
+		admin.ProfileCmd(imsConfig),
+		admin.OrganizationsCmd(imsConfig),
 	)
 	return cmd
 }
diff --git a/cmd/admin_organizations.go → cmd/admin/organizations.go b/cmd/admin_organizations.go → cmd/admin/organizations.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package admin
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func adminOrganizationsCmd(imsConfig *ims.Config) *cobra.Command {
+func OrganizationsCmd(imsConfig *ims.Config) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:     "organizations",

diff --git a/cmd/admin_profile.go → cmd/admin/profile.go b/cmd/admin_profile.go → cmd/admin/profile.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package admin
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func adminProfileCmd(imsConfig *ims.Config) *cobra.Command {
+func ProfileCmd(imsConfig *ims.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "profile",
 		Short: "Requests the user profile using the admin API.",

diff --git a/cmd/authz.go b/cmd/authz.go
@@ -11,6 +11,7 @@
 package cmd
 
 import (
+	"github.com/adobe/imscli/cmd/authz"
 	"github.com/adobe/imscli/ims"
 	"github.com/spf13/cobra"
 )
@@ -26,11 +27,11 @@ This command has no effect by itself, the authorization type needs to be specifi
 `,
 	}
 	cmd.AddCommand(
-		authzUserCmd(imsConfig),
-		authzUserPkceCmd(imsConfig),
-		authzServiceCmd(imsConfig),
-		authzJWTCmd(imsConfig),
-		authzClientCredentialsCmd(imsConfig),
+		authz.UserCmd(imsConfig),
+		authz.UserPkceCmd(imsConfig),
+		authz.ServiceCmd(imsConfig),
+		authz.JWTCmd(imsConfig),
+		authz.ClientCredentialsCmd(imsConfig),
 	)
 	return cmd
 }
diff --git a/cmd/authz_client.go → cmd/authz/client.go b/cmd/authz_client.go → cmd/authz/client.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package authz
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func authzClientCredentialsCmd(imsConfig *ims.Config) *cobra.Command {
+func ClientCredentialsCmd(imsConfig *ims.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "clientCredentials",
 		Aliases: []string{"client"},

diff --git a/cmd/authz_jwt.go → cmd/authz/jwt.go b/cmd/authz_jwt.go → cmd/authz/jwt.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package authz
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func authzJWTCmd(imsConfig *ims.Config) *cobra.Command {
+func JWTCmd(imsConfig *ims.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "jwt",
 		Short: "Exchange a JWT for an access token.",

diff --git a/cmd/authz_pkce.go → cmd/authz/pkce.go b/cmd/authz_pkce.go → cmd/authz/pkce.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package authz
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func authzUserPkceCmd(imsConfig *ims.Config) *cobra.Command {
+func UserPkceCmd(imsConfig *ims.Config) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:   "pkce",

diff --git a/cmd/authz_service.go → cmd/authz/service.go b/cmd/authz_service.go → cmd/authz/service.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package authz
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func authzServiceCmd(imsConfig *ims.Config) *cobra.Command {
+func ServiceCmd(imsConfig *ims.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "service",
 		Short: "Negotiate a service to service token.",

diff --git a/cmd/authz_user.go → cmd/authz/user.go b/cmd/authz_user.go → cmd/authz/user.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package authz
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func authzUserCmd(imsConfig *ims.Config) *cobra.Command {
+func UserCmd(imsConfig *ims.Config) *cobra.Command {
 
 	cmd := &cobra.Command{
 		Use:   "user",

diff --git a/cmd/invalidate.go b/cmd/invalidate.go
@@ -11,6 +11,7 @@
 package cmd
 
 import (
+	"github.com/adobe/imscli/cmd/invalidate"
 	"github.com/adobe/imscli/ims"
 	"github.com/spf13/cobra"
 )
@@ -27,10 +28,10 @@ This command has no effect by itself, the token type must be specified as a subc
 `,
 	}
 	cmd.AddCommand(
-		invalidateAccessTokenCmd(imsConfig),
-		invalidateRefreshTokenCmd(imsConfig),
-		invalidateDeviceTokenCmd(imsConfig),
-		invalidateServiceTokenCmd(imsConfig),
+		invalidate.AccessTokenCmd(imsConfig),
+		invalidate.RefreshTokenCmd(imsConfig),
+		invalidate.DeviceTokenCmd(imsConfig),
+		invalidate.ServiceTokenCmd(imsConfig),
 	)
 	return cmd
 }
diff --git a/cmd/invalidate_access_token.go → cmd/invalidate/access_token.go b/cmd/invalidate_access_token.go → cmd/invalidate/access_token.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package invalidate
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func invalidateAccessTokenCmd(imsConfig *ims.Config) *cobra.Command {
+func AccessTokenCmd(imsConfig *ims.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "accessToken",
 		Aliases: []string{"acc"},

diff --git a/cmd/invalidate_device_token.go → cmd/invalidate/device_token.go b/cmd/invalidate_device_token.go → cmd/invalidate/device_token.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package invalidate
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func invalidateDeviceTokenCmd(imsConfig *ims.Config) *cobra.Command {
+func DeviceTokenCmd(imsConfig *ims.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "deviceToken",
 		Aliases: []string{"dev"},

diff --git a/cmd/invalidate_refresh_token.go → cmd/invalidate/refresh_token.go b/cmd/invalidate_refresh_token.go → cmd/invalidate/refresh_token.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package invalidate
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func invalidateRefreshTokenCmd(imsConfig *ims.Config) *cobra.Command {
+func RefreshTokenCmd(imsConfig *ims.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "refreshToken",
 		Aliases: []string{"ref"},

diff --git a/cmd/invalidate_service_token.go → cmd/invalidate/service_token.go b/cmd/invalidate_service_token.go → cmd/invalidate/service_token.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package invalidate
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func invalidateServiceTokenCmd(imsConfig *ims.Config) *cobra.Command {
+func ServiceTokenCmd(imsConfig *ims.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "serviceToken",
 		Aliases: []string{"svc"},

diff --git a/cmd/validate.go b/cmd/validate.go
@@ -11,6 +11,7 @@
 package cmd
 
 import (
+	"github.com/adobe/imscli/cmd/validate"
 	"github.com/adobe/imscli/ims"
 	"github.com/spf13/cobra"
 )
@@ -27,10 +28,10 @@ This command has no effect by itself, the token type must be specified as a subc
 `,
 	}
 	cmd.AddCommand(
-		validateAccessTokenCmd(imsConfig),
-		validateRefreshTokenCmd(imsConfig),
-		validateDeviceTokenCmd(imsConfig),
-		validateAuthzCodeCmd(imsConfig),
+		validate.AccessTokenCmd(imsConfig),
+		validate.RefreshTokenCmd(imsConfig),
+		validate.DeviceTokenCmd(imsConfig),
+		validate.AuthzCodeCmd(imsConfig),
 	)
 	return cmd
 }
diff --git a/cmd/validate_access_token.go → cmd/validate/access_token.go b/cmd/validate_access_token.go → cmd/validate/access_token.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package validate
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func validateAccessTokenCmd(imsConfig *ims.Config) *cobra.Command {
+func AccessTokenCmd(imsConfig *ims.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "accessToken",
 		Aliases: []string{"acc"},

diff --git a/cmd/validate_authorization_code.go → cmd/validate/authorization_code.go b/cmd/validate_authorization_code.go → cmd/validate/authorization_code.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package validate
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func validateAuthzCodeCmd(imsConfig *ims.Config) *cobra.Command {
+func AuthzCodeCmd(imsConfig *ims.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "authorizationCode",
 		Aliases: []string{"authz"},

diff --git a/cmd/validate_device_token.go → cmd/validate/device_token.go b/cmd/validate_device_token.go → cmd/validate/device_token.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package validate
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func validateDeviceTokenCmd(imsConfig *ims.Config) *cobra.Command {
+func DeviceTokenCmd(imsConfig *ims.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "deviceToken",
 		Aliases: []string{"dev"},

diff --git a/cmd/validate_refresh_token.go → cmd/validate/refresh_token.go b/cmd/validate_refresh_token.go → cmd/validate/refresh_token.go
@@ -8,7 +8,7 @@
 // OF ANY KIND, either express or implied. See the License for the specific language
 // governing permissions and limitations under the License.
 
-package cmd
+package validate
 
 import (
 	"fmt"
@@ -17,7 +17,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func validateRefreshTokenCmd(imsConfig *ims.Config) *cobra.Command {
+func RefreshTokenCmd(imsConfig *ims.Config) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "refreshToken",
 		Aliases: []string{"ref"},