Revert "HCF-906 Write hcp-dist output files to output/"

.gitignore

@@ -28,4 +28,3 @@ src/*-clone
 /hcp-ha-hcf-*.zip
 /hcp-hcf-*.zip
 /mpc-hcf-*.zip
-output/

Makefile

@@ -175,8 +175,8 @@ show-versions:
 
 generate: \
 	hcp \
-	hcp-instance-basic-dev \
-	hcp-instance-ha-dev \
+	hcp-instance \
+	hcp-instance-ha \
 	mpc \
 	aws \
 	aws-spot \
@@ -187,11 +187,11 @@ generate: \
 hcp:
 	${GIT_ROOT}/make/generate hcp
 
-hcp-instance-basic-dev:
-	${GIT_ROOT}/make/generate instance-basic-dev
+hcp-instance:
+	${GIT_ROOT}/make/generate hcp-instance
 
-hcp-instance-ha-dev:
-	${GIT_ROOT}/make/generate instance-ha-dev
+hcp-instance-ha:
+	${GIT_ROOT}/make/generate hcp-instance-ha
 
 mpc:
 	${GIT_ROOT}/make/generate mpc
@@ -212,15 +212,17 @@ aws-spot-proxy:
 
 dist: \
 	hcp-dist \
+	hcp-ha-dist \
 	mpc-dist \
 	aws-dist \
 	aws-spot-dist \
 	aws-proxy-dist \
 	aws-spot-proxy-dist \
 	${NULL}
 
-hcp-dist: hcp hcp-instance-basic-dev hcp-instance-ha-dev
+hcp-dist: hcp hcp-instance hcp-instance-ha
 	${GIT_ROOT}/make/package-hcp
+	rm hcf-hcp*.json
 
 mpc-dist: mpc
 	${GIT_ROOT}/make/package-terraform mpc

bin/rm-transformer/hcp-instance.rb

@@ -49,8 +49,8 @@ def load_template
 
   def dirs_for_flavor
     {
-      'hcp/instance-basic-dev.template.json' => ['bin/settings', 'bin/settings/hcp'],
-      'hcp/instance-ha-dev.template.json' => ['bin/settings', 'bin/settings/hcp', 'bin/settings/hcp/ha']
+      'hcp/hcf-hcp-instance.template.json' => ['bin/settings', 'bin/settings/hcp'],
+      'hcp/hcf-hcp-instance-ha.template.json' => ['bin/settings', 'bin/settings/hcp', 'bin/settings/hcp/ha']
     }
   end
 

make/generate

@@ -35,8 +35,6 @@ case ${TARGET} in
     ;;
 esac
 
-mkdir -p output
-
 case ${TARGET} in
     vagrant)
         OUTFILE=${OUTFILE:-"${TARGET}.json"}
@@ -49,7 +47,7 @@ case ${TARGET} in
 	CLEAN="${CLEAN} vagrant-propmap.yaml"
         ;;
     hcp)
-        OUTFILE=${OUTFILE:-"output/sdl.json"}
+        OUTFILE=${OUTFILE:-"hcf-${TARGET}.json"}
         OPTIONS="${OPTIONS} --provider \"${TARGET}\""
 
 	( . ${GIT_ROOT}/make/include/fissile
@@ -58,9 +56,9 @@ case ${TARGET} in
         OPTIONS="${OPTIONS} --property-map hcf-hcp-propmap.yaml"
 	CLEAN="${CLEAN} hcf-hcp-propmap.yaml"
         ;;
-    instance-basic-dev|instance-ha-dev)
-        OUTFILE=${OUTFILE:-"output/${TARGET}.json"}
-        TEMPLATE="hcp/${TARGET}.template.json"
+    hcp-instance|hcp-instance-ha)
+        OUTFILE=${OUTFILE:-"hcf-${TARGET}.json"}
+        TEMPLATE="hcp/hcf-${TARGET}.template.json"
         OPTIONS="${OPTIONS} --provider hcp-instance --instance-definition-template ${TEMPLATE}"
         ;;
     *)

make/package-hcp

@@ -8,12 +8,10 @@ GIT_ROOT=${GIT_ROOT:-$(git rev-parse --show-toplevel)}
 
 ARTIFACT=hcp-${APP_VERSION}.zip
 
-rm ${GIT_ROOT}/${ARTIFACT} 2>/dev/null || true
-
-cd output && zip -9 ${GIT_ROOT}/${ARTIFACT} \
-    sdl.json \
-    instance-basic-dev.json \
-    instance-ha-dev.json \
+zip -9 ${GIT_ROOT}/${ARTIFACT} \
+    hcf-hcp.json \
+    hcf-hcp-instance.json \
+    hcf-hcp-instance-ha.json \
     ${NULL:-}
 
 echo Generated ${ARTIFACT}