update goci and ci-scripts to use entity endpoint only (#176)

and delete unused scripts

Author: Tanmay Sardesai

VERSION

@@ -1,7 +1,8 @@
-v1.4.0
-run validate as last step on artifact-build-publish-deploy
+v1.5.0
+catalog sync is now uses entity endpoint for everything
 
 Previously:
+- run validate as last step on artifact-build-publish-deploy
 - upgrade all aws sdk v2 modules
 - reverting node version validation for now
 - goci now supports validation of node version
@@ -11,4 +12,3 @@ Previously:
 - Updating goci warning message, including recent version release date
 - Supporting lazy loading of environment variables
 - updated parsing of go version from go.mod
-- goci now supports validation of go version

circleci/catalog-sync

@@ -5,7 +5,7 @@
 #
 # Usage:
 #
-#   catalog-sync [CIRCLE_CI_INTEGRATIONS_URL] [USER] [PASS] [APP_NAME]
+#   catalog-sync [CIRCLE_CI_INTEGRATIONS_URL] [USER] [PASS] [ENTITY_NAME] [TYPE]
 #
 
 set -e
@@ -24,16 +24,18 @@ USER=$2
 if [[ -z $USER ]]; then echo "Missing arg2 USER" && exit 1; fi
 PASS=$3
 if [[ -z $PASS ]]; then echo "Missing arg3 PASS" && exit 1; fi
-APP_NAME=$4
-if [[ -z $APP_NAME ]]; then echo "Missing arg4 APP_NAME" && exit 1; fi
+ENTITY_NAME=$4
+if [[ -z $ENTITY_NAME ]]; then echo "Missing arg4 ENTITY_NAME" && exit 1; fi
+TYPE=$5
+if [[ -z $TYPE ]]; then echo "Missing arg5 TYPE" && exit 1; fi
 
 echo "Posting to catalog sync service..."
 SC=$(curl -u $USER:$PASS \
   --retry 5 \
   -w "%{http_code}" \
   -H "Content-Type: application/json" \
   -X POST \
-  $CIRCLE_CI_INTEGRATIONS_URL/serviceCatalog?app=$APP_NAME)
+  $CIRCLE_CI_INTEGRATIONS_URL/catalogEntity?entity=$ENTITY_NAME&type=$TYPE)
 
 if [ "$SC" -eq 200 ]; then
   echo "Successfully published app catalog config"

circleci/catapult-publish

@@ -122,7 +122,7 @@ fi
 
 # publish catalog app config
 CATALOG_SYNC_SCRIPT="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )/catalog-sync"
-"${CATALOG_SYNC_SCRIPT}" $CIRCLE_CI_INTEGRATIONS_URL $CATAPULT_USER $CATAPULT_PASS $APP_NAME
+"${CATALOG_SYNC_SCRIPT}" $CIRCLE_CI_INTEGRATIONS_URL $CATAPULT_USER $CATAPULT_PASS $APP_NAME "application"
 
 # publish dep info
 BREAKDOWN_SYNC_SCRIPT="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )/breakdown-sync"

circleci/catapult-publish-lambda

@@ -128,7 +128,7 @@ fi
 
 # publish catalog app config
 CATALOG_SYNC_SCRIPT="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )/catalog-sync"
-"${CATALOG_SYNC_SCRIPT}" $CIRCLE_CI_INTEGRATIONS_URL $CATAPULT_USER $CATAPULT_PASS $APP_NAME
+"${CATALOG_SYNC_SCRIPT}" $CIRCLE_CI_INTEGRATIONS_URL $CATAPULT_USER $CATAPULT_PASS $APP_NAME "application"
 
 # publish dep info
 BREAKDOWN_SYNC_SCRIPT="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )/breakdown-sync"

circleci/catapult-publish-spark

@@ -282,23 +282,11 @@ func publishUtility() error {
 		return fmt.Errorf("failed to read catalog-info.yaml file: %v", err)
 	}
 
-	// Check to see if type is defined on Spec
-	if catalogInfo.Spec == nil {
-		return fmt.Errorf("catalog-info.yaml file does not contain a valid spec")
-	}
-	if _, ok := catalogInfo.Spec["type"]; !ok {
-		return fmt.Errorf("catalog-info.yaml file does not contain a valid type in spec")
-	}
-	typeVal, ok := catalogInfo.Spec["type"].(string)
-	if !ok {
-		return fmt.Errorf("catalog-info.yaml file does not contain a valid type in spec")
-	}
-
 	cp := catapult.New()
 
 	err = cp.SyncCatalogEntity(context.Background(), &ciIntegrationsModels.SyncCatalogEntityInput{
 		Entity: catalogInfo.GetName(),
-		Type:   typeVal,
+		Type:   "utility",
 	})
 	if err != nil {
 		return fmt.Errorf("failed to sync catalog entity with catapult: %v", err)

circleci/golang-install

@@ -46,7 +46,7 @@ func New() *Catapult {
 
 // SyncCatalogEntity syncs passed in entity to catalog-config by calling circle-ci-integrations
 func (c *Catapult) SyncCatalogEntity(ctx context.Context, entity *models.SyncCatalogEntityInput) error {
-	fmt.Println("Syncing catalog entity", entity.Entity)
+	fmt.Printf("Syncing catalog entity %s with type %s\n", entity.Entity, entity.Type)
 	err := c.client.SyncCatalogEntity(ctx, entity)
 	if err != nil {
 		return fmt.Errorf("failed to sync catalog entity %s with catalogue config: %v", entity.Entity, err)
@@ -71,8 +71,9 @@ func (c *Catapult) Publish(ctx context.Context, artifacts []*Artifact) error {
 				return fmt.Errorf("failed to publish %s with catapult: %v", art.ID, err)
 			}
 
-			err = c.client.SyncCatalogApp(grpCtx, &models.SyncCatalogAppInput{
-				App: art.ID,
+			err = c.SyncCatalogEntity(grpCtx, &models.SyncCatalogEntityInput{
+				Entity: art.ID,
+				Type:   "application",
 			})
 			if err != nil {
 				fmt.Println("failed to sync catalog app", art.ID, "with catalogue config:", err)