Merge pull request #36 from napptive/PG-134/Remove_app_command

Add application commands

cmd/catalog-manager/commands/admin.go

@@ -0,0 +1,82 @@
+/**
+ * Copyright 2021 Napptive
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package commands
+
+import (
+	"github.com/napptive/catalog-manager/internal/app/cli"
+	"github.com/spf13/cobra"
+)
+
+var adminCmdLongHelp = `admin commands`
+var adminCmdShortHelp = `admin commands`
+
+var adminCmd = &cobra.Command{
+	Use:   "admin",
+	Long:  adminCmdLongHelp,
+	Short: adminCmdShortHelp,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return cmd.Help()
+	},
+}
+
+var listCmdLongHelp = `list the catalog applications`
+var listCmdShortHelp = `list the catalog applications`
+var listCmd = &cobra.Command{
+	Use:   "list [namespace]",
+	Long:  listCmdLongHelp,
+	Short: listCmdShortHelp,
+	Aliases: []string{"ls"},
+	Args:  cobra.MaximumNArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		namespace := ""
+		if len(args) > 0 {
+			namespace = args[0]
+		}
+		op, err := cli.NewApplicationCli(cfg.AdminGRPCPort)
+		if err != nil {
+			return err
+		}
+		return op.List(namespace)
+	},
+}
+
+var deleteAppCmdLongHelp = `Delete applications from catalog. 
+You can delete a namespace indicating the name as arg or delete only one application by passing the name as namespace/applicationName`
+var deleteAppCmdShortHelp = `Delete catalog application`
+
+var deleteAppCmd = &cobra.Command{
+	Use:   "delete <applicationName>",
+	Long:  deleteAppCmdLongHelp,
+	Short: deleteAppCmdShortHelp,
+	Aliases: []string{"rm", "remove"},
+	Args:  cobra.ExactArgs(1),
+	RunE: func(cmd *cobra.Command, args []string) error {
+		op, err := cli.NewApplicationCli(cfg.AdminGRPCPort)
+		if err != nil {
+			return err
+		}
+		return op.Delete(args[0])
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(adminCmd)
+
+	adminCmd.AddCommand(deleteAppCmd)
+	adminCmd.AddCommand(listCmd)
+
+	adminCmd.PersistentFlags().IntVar(&cfg.CatalogManager.AdminGRPCPort, "adminGRPCPort", 7062, "gRPC Port to connect the Catalog-manager admin API")
+}

cmd/catalog-manager/commands/cli.go

@@ -69,7 +69,7 @@ var loginUserCmd = &cobra.Command{
 
 func init() {
 
-	userCmd.PersistentFlags().StringVarP(&connString, "connectionString", "c", "host=postgres user=postgres password=postgres port=5432","connection string to connect postgres database")
+	userCmd.PersistentFlags().StringVarP(&connString, "connectionString", "c", "host=postgres user=postgres password=postgres port=5432", "connection string to connect postgres database")
 
 	rootCmd.AddCommand(userCmd)
 	userCmd.AddCommand(createUserCmd)

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/kr/text v0.2.0 // indirect
 	github.com/napptive/analytics v1.0.1
 	github.com/napptive/grpc-catalog-common-go v0.2.0
-	github.com/napptive/grpc-catalog-go v0.16.0
+	github.com/napptive/grpc-catalog-go v0.17.0
 	github.com/napptive/mockup-generator v1.0.1-0.20210630142914-ae5eac8f9f80
 	github.com/napptive/nerrors v1.0.0
 	github.com/napptive/njwt v1.0.1-0.20210709073938-ea6f9de62a71

go.sum

@@ -397,8 +397,8 @@ github.com/napptive/grpc-authx-go v0.9.0 h1:hU4LP5l+bbj7eGQu/uElDZZUUG44q9jTxiZ4
 github.com/napptive/grpc-authx-go v0.9.0/go.mod h1:BHBradRIe4tKea4ze9ju9F1NWTX+c9NGBEh3xV9bpK0=
 github.com/napptive/grpc-catalog-common-go v0.2.0 h1:BdIYVOEmzIZbzbVvjKnd9/8T8nQfNqZeEzzVCXjWhvI=
 github.com/napptive/grpc-catalog-common-go v0.2.0/go.mod h1:bnedZvTuFnhO2q1u66EUseAy3k0/N5MW/BFvb8S23bA=
-github.com/napptive/grpc-catalog-go v0.16.0 h1:u832OVhpHojFqkM5nK0kK4QY4bMa0U3MPpzlUJj9Eyw=
-github.com/napptive/grpc-catalog-go v0.16.0/go.mod h1:BoOdDpZZlW8rWNlSe2/mjG9JC6+UCLlZkUNovwMFxY0=
+github.com/napptive/grpc-catalog-go v0.17.0 h1:y2m+9LER//Hu2RvXlKuyA7E23AxCWR1KxI7cmbeuk34=
+github.com/napptive/grpc-catalog-go v0.17.0/go.mod h1:BoOdDpZZlW8rWNlSe2/mjG9JC6+UCLlZkUNovwMFxY0=
 github.com/napptive/grpc-common-go v0.2.0/go.mod h1:Q896cZY+yIkted9zYw3jtguVDdfL1bqTHjjiirBTjnw=
 github.com/napptive/grpc-common-go v0.4.0 h1:uN6sxr8tidDEPwhVLA6UwnGpNHwuI+QTwWdfTseoiQc=
 github.com/napptive/grpc-common-go v0.4.0/go.mod h1:Q896cZY+yIkted9zYw3jtguVDdfL1bqTHjjiirBTjnw=

internal/app/catalog-manager/service.go

@@ -216,7 +216,7 @@ func (s *Service) LaunchHTTPService() {
 	var grpcOptions []grpc.DialOption
 	if s.cfg.TLSConfig.LaunchSecureService {
 		tlsConfig := &tls.Config{
-                           // Since the proxy may not be seeing the same DNS address, skip the verification for now.
+			// Since the proxy may not be seeing the same DNS address, skip the verification for now.
 			InsecureSkipVerify: true,
 		}
 		tlsCredentials := credentials.NewTLS(tlsConfig)

internal/app/cli/admin.go

@@ -0,0 +1,83 @@
+/**
+ * Copyright 2021 Napptive
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cli
+
+import (
+	"fmt"
+	grpc_catalog_go "github.com/napptive/grpc-catalog-go"
+	"github.com/napptive/nerrors/pkg/nerrors"
+	"github.com/rs/zerolog/log"
+	"golang.org/x/net/context"
+	"google.golang.org/grpc"
+	"strings"
+	"time"
+)
+
+type ApplicationCli struct {
+	// adminClient to connect to Admin interface
+	adminClient grpc_catalog_go.NamespaceAdministrationClient
+}
+
+func NewApplicationCli(adminPort int) (*ApplicationCli, error) {
+	dir := fmt.Sprintf(":%d", adminPort)
+	log.Info().Str("dir", dir).Msg("admin direction")
+	conn, err := grpc.Dial(dir, grpc.WithInsecure())
+	if err != nil {
+		return nil, err
+	}
+	client := grpc_catalog_go.NewNamespaceAdministrationClient(conn)
+	return &ApplicationCli{
+		adminClient: client,
+	}, nil
+}
+
+// Delete removes applications from the catalog
+// if app is an applicationName removes it and
+// if app is a namespace removes all the namespace applications
+func (ac *ApplicationCli) Delete(app string) error {
+	log.Debug().Str("appName", app).Msg("Delete")
+
+	if app == "" {
+		return nerrors.NewFailedPreconditionError("applicationName or namespace mut be filled")
+	}
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+	defer cancel()
+
+	// check if app is an applicationName or is a namespace
+	// applicationName -> namespace/appName
+	// namespace -> namespace
+	if strings.Contains(app, "/") {
+		response, err := ac.adminClient.DeleteApplication(ctx, &grpc_catalog_go.RemoveApplicationRequest{ApplicationId: app})
+		PrintResultOrError(response, err)
+	} else {
+		// is a namespace
+		response, err := ac.adminClient.Delete(ctx, &grpc_catalog_go.DeleteNamespaceRequest{Namespace: app})
+		PrintResultOrError(response, err)
+	}
+
+	return nil
+}
+
+func (ac *ApplicationCli) List(namespace string) error {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
+	defer cancel()
+
+	response, err := ac.adminClient.List(ctx, &grpc_catalog_go.ListApplicationsRequest{Namespace: namespace})
+	PrintResultOrError(response, err)
+
+	return nil
+}

internal/app/cli/helpers.go

@@ -0,0 +1,43 @@
+/**
+ * Copyright 2021 Napptive
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cli
+
+import (
+	"fmt"
+	"github.com/napptive/catalog-manager/internal/pkg/printer"
+
+	"github.com/napptive/nerrors/pkg/nerrors"
+	"github.com/rs/zerolog"
+)
+
+// PrintResultOrError prints the result using a given printer or the error.
+func PrintResultOrError(result interface{}, err error) {
+	if err != nil {
+		if zerolog.GlobalLevel() == zerolog.DebugLevel {
+			fmt.Println(nerrors.FromError(err).StackTraceToString())
+		} else {
+			fmt.Println(err.Error())
+		}
+	} else {
+		if pErr := printer.NewTablePrinter().Print(result); pErr != nil {
+			if zerolog.GlobalLevel() == zerolog.DebugLevel {
+				fmt.Println(nerrors.FromError(pErr).StackTraceToString())
+			} else {
+				fmt.Println(pErr.Error())
+			}
+		}
+	}
+}

internal/pkg/config/bq_config.go

@@ -24,15 +24,15 @@ type BQConfig struct {
 	Config bqconfig.BigQueryConfig
 }
 
-func (bq *BQConfig) IsValid () error {
+func (bq *BQConfig) IsValid() error {
 	if bq.Enabled {
 		return bq.Config.IsValid()
 	}
 	return nil
 }
 
-func (bq *BQConfig) Print () {
+func (bq *BQConfig) Print() {
 	if bq.Enabled {
 		bq.Config.Print()
 	}
-}
+}

internal/pkg/config/config.go

@@ -35,9 +35,9 @@ type Config struct {
 	// Version of the application.
 	Version string
 	// Commit related to this built.
-	Commit  string
+	Commit string
 	// Debug flag.
-	Debug   bool
+	Debug bool
 }
 
 // IsValid checks if the configuration options are valid.

internal/pkg/config/jwtconfig.go

@@ -14,7 +14,6 @@ type JWTConfig struct {
 	nwjtConfig.JWTConfig
 }
 
-
 // IsValid checks if the configuration options are valid.
 func (c *JWTConfig) IsValid() error {
 	if c.AuthEnabled {
@@ -32,4 +31,4 @@ func (c *JWTConfig) Print() error {
 	}
 
 	return nil
-}
+}

internal/pkg/config/sql.go

@@ -19,4 +19,4 @@ package config
 type UserSQL struct {
 	// ConnStr with the connection string to connect to database
 	ConnStr string
-}
+}

internal/pkg/entities/entities.go

@@ -37,19 +37,19 @@ func (a *AppSummary) ToApplicationSummary() *grpc_catalog_go.ApplicationSummary
 
 	// map[string][]ApplicationLogo TO map[string]* Logo []*ApplicationLogo
 
-	logoSummary := make (map[string]*grpc_catalog_go.ApplicationLogoList)
+	logoSummary := make(map[string]*grpc_catalog_go.ApplicationLogoList)
 	for key, value := range a.MetadataLogo {
-		logoList := make ([]*grpc_catalog_go.ApplicationLogo, 0)
+		logoList := make([]*grpc_catalog_go.ApplicationLogo, 0)
 		for _, logo := range value {
 			logoList = append(logoList, logo.ToGRPC())
 		}
 		logoSummary[key] = &grpc_catalog_go.ApplicationLogoList{Logo: logoList}
 	}
 
 	return &grpc_catalog_go.ApplicationSummary{
-		Namespace:       a.Namespace,
-		ApplicationName: a.ApplicationName,
-		TagMetadataName: a.TagMetadataName,
+		Namespace:              a.Namespace,
+		ApplicationName:        a.ApplicationName,
+		TagMetadataName:        a.TagMetadataName,
 		SummaryApplicationLogo: logoSummary,
 	}
 }
@@ -87,7 +87,7 @@ type ExtendedAppSummary struct {
 // -- ApplicationMetadata
 
 // ApplicationInfo with the metadata of application, this will be the application info showed
-type 	ApplicationInfo struct {
+type ApplicationInfo struct {
 	// CatalogID with an internal identifier
 	CatalogID string
 	// Namespace where the application is located.

internal/pkg/printer/common.go

@@ -0,0 +1,23 @@
+/**
+ * Copyright 2021 Napptive
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package printer
+
+// ResultPrinter defines the operations that a printer must define. Multiple printer are
+// offered depending on the desired output format.
+type ResultPrinter interface {
+	// Print the result.
+	Print(result interface{}) error
+}