Skip to content
This repository was archived by the owner on Aug 5, 2024. It is now read-only.

Commit b02f7e6

Browse files
authored
Merge pull request #174 from IBM/hpvs_wizard_patch
Added additional formatting
2 parents 5e4e08f + fed4cb3 commit b02f7e6

File tree

1 file changed

+27
-7
lines changed

1 file changed

+27
-7
lines changed

automation/DeployToHPVS.bashlib

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,13 @@ config_file_wizard(){
489489
# Config variable: APIKey #
490490
#--------------------------------------------------------------------------#
491491
PROMPT_USER_READARGS="-s"
492-
prompt_user "Enter an IAM key (platform API key) for your IBM Cloud account. An example API key looks like this k-y2lsNxfeKbaidcCG6kQVypLDR_WjmDPe-2Uuq_PTYx
492+
prompt_user "
493+
===============================================================
494+
Enter an IAM key (platform API key) for your IBM Cloud account.
495+
An example API key looks like this:
496+
497+
k-y2lsNxfeKbaidcCG6kQVypLDR_WjmDPe-2Uuq_PTYx
498+
493499
Login to your IBM Cloud account and navigate to Manage > Access (IAM) > API keys for more information." false
494500
unset PROMPT_USER_READARGS
495501
APIKey=${USERINPUT}
@@ -498,8 +504,12 @@ Login to your IBM Cloud account and navigate to Manage > Access (IAM) > API keys
498504
#--------------------------------------------------------------------------#
499505
# Config variable: registryURL #
500506
#--------------------------------------------------------------------------#
501-
prompt_user "Enter URL of container registry. For example, us.icr.io for IBM Cloud Container Registry
502-
For more information about creating a container registry in IBM Cloud see here https://cloud.ibm.com/apidocs/container-registry" false "docker.io"
507+
prompt_user "
508+
===============================================================
509+
Enter URL of container registry. For example, us.icr.io for IBM Cloud Container Registry
510+
For more information about creating a container registry in IBM Cloud see here:
511+
512+
https://cloud.ibm.com/apidocs/container-registry" false "docker.io"
503513
registryURL=$(echo "${USERINPUT}" | tr '[:upper:]' '[:lower:]') # Make lowercase
504514

505515
# Strip "http://" or "https://" from string
@@ -539,7 +549,11 @@ For more information about creating a container registry in IBM Cloud see here h
539549
# user just hits ENTER. For IBM Cloud users, it guesses your system userid
540550
# as a default.
541551
if [[ "$usingICR" == true ]]; then
542-
prompt_user "Enter target namespace. If using IBM Cloud Container Registry, a new namespace must first be created via the web UI, or using the IBM Cloud CLI command: ibmcloud cr namespace-add YOURNAMESPACE." true "${whoami}"
552+
prompt_user "
553+
===============================================================
554+
Enter target namespace.
555+
If using IBM Cloud Container Registry, a new namespace must first be created via the web UI, or using the IBM Cloud CLI command:
556+
ibmcloud cr namespace-add YOURNAMESPACE." true "${whoami}"
543557
else
544558
prompt_user "Enter target namespace. If using DockerHub, you can default to the name of your DockerHub account." true "${dockerUser}"
545559
fi
@@ -567,9 +581,15 @@ For more information about creating a container registry in IBM Cloud see here h
567581
#--------------------------------------------------------------------------#
568582
# Config variable: rootPassphrase #
569583
#--------------------------------------------------------------------------#
570-
prompt_for_passphrase "Now we'll need to generate some keys, a Root key which is the root key of the docker content trust to store a tagged image,
571-
a repository key (aka target key); allows you to sign image tags and manage delegations (including delegated keys or permitted delegation paths),
572-
an Encryption key for the HPVS registration definition file (generated automatically in the background) and a Vendor key, required for signing the HPVS registration definition file
584+
prompt_for_passphrase "
585+
===============================================================
586+
Now we'll need to generate some keys,
587+
588+
1. a Root key which is the root key of the docker content trust to store a tagged image,
589+
2. a repository key (aka target key); allows you to sign image tags and manage delegations (including delegated keys or permitted delegation paths),
590+
3. an Encryption key for the HPVS registration definition file (generated automatically in the background),
591+
4. a Vendor key, required for signing the HPVS registration definition file
592+
573593
Enter passphrase for the root signing key" true
574594
change_config_var ${1} "rootPassphrase" "${USERINPUT}"
575595

0 commit comments

Comments
 (0)