get all also list gateway resource (#96)

* get all also list gateway resource

* Update cmd/get.go

Co-authored-by: Aurélie Marcuzzo <[email protected]>

* Update cmd/get.go

Co-authored-by: Aurélie Marcuzzo <[email protected]>

---------

Co-authored-by: Aurélie Marcuzzo <[email protected]>

Author: strokyl

cmd/get.go

@@ -94,10 +94,22 @@ func printResource(result interface{}, format OutputFormat) error {
 	return nil
 }
 
+func isGateway(kind schema.Kind) bool {
+	_, isGatewayKind := kind.GetLatestKindVersion().(*schema.GatewayKindVersion)
+	return isGatewayKind
+}
+
+func isConsole(kind schema.Kind) bool {
+	_, isConsoleKind := kind.GetLatestKindVersion().(*schema.ConsoleKindVersion)
+	return isConsoleKind
+}
+
 func initGet(kinds schema.KindCatalog) {
 	rootCmd.AddCommand(getCmd)
 	var format OutputFormat = YAML
 
+	var onlyGateway *bool
+	var onlyConsole *bool
 	var allCmd = &cobra.Command{
 		Use:   "all",
 		Short: "Get all global resources",
@@ -106,23 +118,35 @@ func initGet(kinds schema.KindCatalog) {
 			var allResources []resource.Resource
 
 			kindsByName := sortedKeys(kinds)
+			if gatewayApiClientError != nil {
+				if *debug || *onlyGateway {
+					fmt.Fprintf(os.Stderr, "Cannot create Gateway client: %s\n", gatewayApiClientError)
+				}
+			}
+			if consoleApiClientError != nil {
+				if *debug || *onlyConsole {
+					fmt.Fprintf(os.Stderr, "Cannot create Console client: %s\n", consoleApiClientError)
 
+				}
+			}
 			for _, key := range kindsByName {
 				kind := kinds[key]
-
-				// keep only the Kinds where kind.GetParentFlag() is empty and not of GatewayKind (demands extra configuration, TODO fix if config is provided)
-				if len(kind.GetParentFlag())+len(kind.GetParentQueryFlag()) > 0 {
+				// keep only the Kinds where listing is provided TODO fix if config is provided
+				if !kind.IsRootKind() {
 					continue
 				}
-				if _, isGatewayKind := kind.GetLatestKindVersion().(*schema.GatewayKindVersion); isGatewayKind {
-					continue
+				var resources []resource.Resource
+				var err error
+				if isGateway(kind) && !*onlyConsole && gatewayApiClientError == nil {
+					resources, err = gatewayApiClient().Get(&kind, []string{}, []string{}, map[string]string{})
+				} else if isConsole(kind) && !*onlyGateway && consoleApiClientError == nil {
+					resources, err = consoleApiClient().Get(&kind, []string{}, []string{}, map[string]string{})
 				}
-
-				resources, err := consoleApiClient().Get(&kind, []string{}, []string{}, map[string]string{})
 				if err != nil {
 					fmt.Fprintf(os.Stderr, "Error fetching resource %s: %s\n", kind.GetName(), err)
 					continue
 				}
+
 				allResources = append(allResources, resources...)
 			}
 			err := printResource(allResources, format)
@@ -132,6 +156,9 @@ func initGet(kinds schema.KindCatalog) {
 			}
 		},
 	}
+	onlyGateway = allCmd.Flags().BoolP("gateway", "g", false, "Only show gateway resources")
+	onlyConsole = allCmd.Flags().BoolP("console", "c", false, "Only show console resources")
+	allCmd.MarkFlagsMutuallyExclusive("gateway", "console")
 	allCmd.Flags().VarP(enumflag.New(&format, "output", OutputFormatIds, enumflag.EnumCaseInsensitive), "output", "o", "Output format. One of: json|yaml|name")
 	getCmd.AddCommand(allCmd)
 

cmd/root.go

@@ -11,13 +11,13 @@ import (
 
 var debug *bool
 var apiClient_ *client.Client
-var apiClientError error
+var consoleApiClientError error
 var gatewayApiClient_ *client.GatewayClient
 var gatewayApiClientError error
 
 func consoleApiClient() *client.Client {
-	if apiClientError != nil {
-		fmt.Fprintf(os.Stderr, "Cannot create client: %s", apiClientError)
+	if consoleApiClientError != nil {
+		fmt.Fprintf(os.Stderr, "Cannot create client: %s", consoleApiClientError)
 		os.Exit(1)
 	}
 	return apiClient_
@@ -42,7 +42,7 @@ For server TLS authentication, you can ignore the certificate by setting CDK_INS
 		if *debug {
 			// ActivateDebug() will enable debug mode for the resty client.
 			// Doesn't need to be set if the client was not initialised correctly.
-			if apiClientError == nil {
+			if consoleApiClientError == nil {
 				consoleApiClient().ActivateDebug()
 			}
 			if gatewayApiClientError == nil {
@@ -66,9 +66,9 @@ func Execute() {
 }
 
 func init() {
-	apiClient_, apiClientError = client.MakeFromEnv()
+	apiClient_, consoleApiClientError = client.MakeFromEnv()
 	var consoleKinds *schema.Catalog
-	if apiClientError == nil {
+	if consoleApiClientError == nil {
 		consoleKinds = apiClient_.GetCatalog()
 	} else {
 		consoleKinds = schema.ConsoleDefaultCatalog()

schema/kind.go

@@ -46,6 +46,22 @@ func (kind *Kind) GetParentFlag() []string {
 	return kindVersion.GetParentPathParam()
 }
 
+func (kind *Kind) IsRootKind() bool {
+	kindVersion := kind.GetLatestKindVersion()
+	if len(kindVersion.GetParentPathParam()) != 0 {
+		return false
+	}
+	if len(kindVersion.GetParentQueryParam()) != 0 {
+		return false
+	}
+	for _, queryParam := range kindVersion.GetListQueryParameter() {
+		if queryParam.Required {
+			return false
+		}
+	}
+	return true
+}
+
 func (kind *Kind) GetParentQueryFlag() []string {
 	kindVersion := kind.GetLatestKindVersion()
 	return kindVersion.GetParentQueryParam()