diff --git a/scripts/publish-app-record.sh b/scripts/publish-app-record.sh index 042ad9c..16dba9f 100755 --- a/scripts/publish-app-record.sh +++ b/scripts/publish-app-record.sh @@ -42,7 +42,8 @@ record: homepage: "$rcd_homepage" license: "$rcd_license" author: "$rcd_author" - repository: "$rcd_repository" + repository: + - "$rcd_repository" repository_ref: "$CERC_REPO_REF" app_version: "$rcd_app_version" app_type: "$CERC_APP_TYPE" diff --git a/scripts/request-app-deployment.sh b/scripts/request-app-deployment.sh index 613218f..d4500f1 100755 --- a/scripts/request-app-deployment.sh +++ b/scripts/request-app-deployment.sh @@ -18,8 +18,8 @@ services: fees: 200000aphoton EOF -if [ -z "$CERC_REGISTRY_DEPLOYMENT_CRN" ] || [ -z "$CERC_REGISTRY_DEPLOYMENT_DNS_CRN" ] || [ -z "$CERC_REGISTRY_APP_CRN" ] || [ -z "$CERC_REGISTRY_REQUEST_CRN" ]; then - echo "CERC_REGISTRY_DEPLOYMENT_CRN, CERC_REGISTRY_DEPLOYMENT_DNS_CRN, CERC_REGISTRY_APP_CRN, and CERC_REGISTRY_REQUEST_CRN are all required." 1>&2 +if [ -z "$CERC_REGISTRY_APP_CRN" ]; then + echo "CERC_REGISTRY_APP_CRN is required." 1>&2 exit 1 fi @@ -29,49 +29,22 @@ if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then exit 1 fi -DNS_RECORD=$(laconic -c $CONFIG_FILE cns name resolve "$CERC_REGISTRY_DEPLOYMENT_DNS_CRN" | jq '.[0]') -if [ -z "$DNS_RECORD" ] || [ "null" == "$DNS_RECORD" ] ; then - if [ -z "$CERC_REGISTRY_DEPLOYMENT_DNS_NAME" ]; then - APP_NAME=$(echo $rcd_name | rev | cut -d'/' -f1 | rev) - ORIGIN_HASH=$(git remote get-url origin | sha256sum | head -c 10) - CERC_REGISTRY_DEPLOYMENT_DNS_NAME="$APP_NAME-$ORIGIN_HASH" - fi -cat < "$RECORD_FILE" -record: - type: DnsRecord - version: 1.0.0 - name: "$CERC_REGISTRY_DEPLOYMENT_DNS_NAME" - resource_type: "SHORT" - meta: - note: "Added by CI" - repository: "`git remote get-url origin`" - repository_ref: "`git log -1 --format="%H"`" -EOF - - cat $RECORD_FILE - RECORD_ID=$(laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} | jq -r '.id') - laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_DEPLOYMENT_DNS_CRN" "$RECORD_ID" - DNS_RECORD=$(laconic -c $CONFIG_FILE cns name resolve "$CERC_REGISTRY_DEPLOYMENT_DNS_CRN" | jq '.[0]') -fi - - cat < "$RECORD_FILE" record: type: ApplicationDeploymentRequest version: 1.0.0 name: "$rcd_name@$rcd_app_version" application: "$CERC_REGISTRY_APP_CRN@$rcd_app_version" - dns: "$CERC_REGISTRY_DEPLOYMENT_DNS_CRN" + dns: "$CERC_REGISTRY_DEPLOYMENT_SHORT_HOSTNAME" deployment: "$CERC_REGISTRY_DEPLOYMENT_CRN" meta: note: "Added by CI" repository: "`git remote get-url origin`" - repository_ref: "`git log -1 --format="%H"`" + repository_ref: "${GITHUB_SHA:-`git log -1 --format="%H"`}" EOF cat $RECORD_FILE RECORD_ID=$(laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} | jq -r '.id') echo $RECORD_ID -laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_REQUEST_CRN" "$RECORD_ID" rm -f $RECORD_FILE $CONFIG_FILE