Merge ~toabctl/ubuntu-docker-images/+git/utils:tag-images-dry-run into ~ubuntu-docker-images/ubuntu-docker-images/+git/utils:main

[Thomas Bechtold]

Improve base image tagging and AWS login

[Sergio Durigan Junior (sergiodj)]

Thank you for the MP, Thomas.

I'm adding a few comments that I'd like you to address, but overall it LGTM and can be merged after we iron out the nits. I also appreciate the descriptive commit messages; thanks a lot for those.

review: Needs Fixing

[Thomas Bechtold (toabctl)]

all comments fixed.

[Sergio Durigan Junior (sergiodj)]

Thanks, LGTM.

review: Approve

diff --git a/README.multi-arch-tagger.md b/README.multi-arch-tagger.md
index dd33eee..40a4d5d 100644
--- a/README.multi-arch-tagger.md
+++ b/README.multi-arch-tagger.md
@@ -52,8 +52,10 @@ To install the package:
   $ apt install awscli
 ```
 
-To configure the software, you will need to create two profiles in
-order to use the tagger.
+To login into AWS, you can either export `AWS_ACCESS_KEY_ID` and
+`AWS_SECRET_ACCESS_KEY` or use a AWS profile.
+When using a profile, you can export `AWS_PROFILE` to use a specific
+profile name or configure two profiles (named like the used namespace):
 
 ```
   $ aws configure --profile ubuntu
diff --git a/helpers/registry-login.sh b/helpers/registry-login.sh
index 7071451..fa2b786 100644
--- a/helpers/registry-login.sh
+++ b/helpers/registry-login.sh
@@ -87,13 +87,22 @@ _login_aws ()
 	exit 1
     fi
 
-    if ! aws configure list --profile "$NAMESPACE" >& /dev/null; then
-	error "You must configure aws-cli with a profile named '$NAMESPACE'."
+    # Use the provided access key ID & secret access key if they're available.
+    if [ -n "$AWS_ACCESS_KEY_ID" ] && [ -n "$AWS_SECRET_ACCESS_KEY" ]; then
+	info "Using \$AWS_ACCESS_KEY_ID and \$AWS_SECRET_ACCESS_KEY"
+	return
+    fi
+
+    # use given or default profile
+    PROFILE_NAME=${AWS_PROFILE:-$NAMESPACE}
+    if ! aws configure list --profile "$PROFILE_NAME" >& /dev/null; then
+	error "You must configure aws-cli with a profile named '$PROFILE_NAME'"
 	error "Please refer to the README file for instructions."
 	exit 1
+    else
+	info "Using \$AWS_PROFILE"
     fi
-
-    export AWS_PROFILE="$NAMESPACE"
+    export AWS_PROFILE="$PROFILE_NAME"
 }
 
 _login_aws_registry1 ()
diff --git a/lib/tag.sh b/lib/tag.sh
index b4b098a..da165cd 100644
--- a/lib/tag.sh
+++ b/lib/tag.sh
@@ -35,6 +35,11 @@ tag_image ()
 	error "Unable to print manifest for ${image}:${source_tag}"
     fi
 
+    if [ "$DRY_RUN" -eq 1 ]; then
+	info "dry-run: not tagging the image"
+	return
+    fi
+
     # We use "|| true" here because we want the command to complete
     # even if it fails.  We check for the HTTP response code below.
     ret=$(curl -X PUT -H "Authorization: Bearer ${REGISTRY_AUTH_TOKEN}" \
diff --git a/tag-images.sh b/tag-images.sh
index b6fbb66..afeacc8 100755
--- a/tag-images.sh
+++ b/tag-images.sh
@@ -86,6 +86,8 @@ Arguments:
   -d|--debug				Print debug statements.  This includes printing
   					the authentication token if using Dockerhub.
 
+  --dry-run				Do a dry run
+
   -- IMAGE_1 IMAGE_2 ... IMAGE_N	Images to tag.  If not specified,
   	 	    			the script will obtain the list of
 					all images from REGISTRY/NAMESPACE
@@ -99,6 +101,7 @@ EOF
 #
 # We perform the tagging of '_stable', '_beta', '_candidate', 'XX.YY'
 # and 'RELEASE_NAME'.
+# Don't tag the current devel release because it's not stable (it's under development)
 do_tag_base_ubuntu_image ()
 {
     local image="ubuntu"
@@ -106,6 +109,9 @@ do_tag_base_ubuntu_image ()
 
     local -a IMAGE_TAGS EDGE_TAGS
 
+    local DISTRONAME_DEVEL
+    DISTRONAME_DEVEL=$(distro-info --devel)
+
     readarray -t IMAGE_TAGS < <(print_tags_for_image "${image}")
 
     readarray -t EDGE_TAGS < <(printf '%s\n' "${IMAGE_TAGS[@]}" \
@@ -125,16 +131,21 @@ do_tag_base_ubuntu_image ()
 
 	IMG_DISTRONAME=$(cut -d'-' -f1 <<< "$EDGE_TAG_PREFIX")
 	IMG_RELEASEVER=$(cut -d'-' -f2 <<< "$EDGE_TAG_PREFIX")
-	for tagsuffix in "${TAG_SUFFIXES[@]}"; do
-	    # Tag each suffix.
-	    if [ -n "$FORCE" ] || ! grep -Fwq "${IMG_RELEASEVER}_${tagsuffix}" <<< "${IMAGE_TAGS[@]}"; then
-		info "Invoking multi-arch tagger for ${NAMESPACE}/${image}:${IMG_RELEASEVER}_${tagsuffix} (source tag: ${EDGE_TAG_PREFIX}_edge) (on ${REGISTRY})"
-		tag_image \
-		    "${image}" \
-		    "${EDGE_TAG_PREFIX}_edge" \
-		    "${IMG_RELEASEVER}_${tagsuffix}"
-	    fi
-	done
+
+	if [ "$IMG_DISTRONAME" != "$DISTRONAME_DEVEL" ]; then
+	    for tagsuffix in "${TAG_SUFFIXES[@]}"; do
+		# Tag each suffix.
+		if [ -n "$FORCE" ] || ! grep -Fwq "${IMG_RELEASEVER}_${tagsuffix}" <<< "${IMAGE_TAGS[@]}"; then
+		    info "Invoking multi-arch tagger for ${NAMESPACE}/${image}:${IMG_RELEASEVER}_${tagsuffix} (source tag: ${EDGE_TAG_PREFIX}_edge) (on ${REGISTRY})"
+		    tag_image \
+			"${image}" \
+			"${EDGE_TAG_PREFIX}_edge" \
+			"${IMG_RELEASEVER}_${tagsuffix}"
+		fi
+	    done
+	else
+	    info "Not adding stable/beta/candidate tags to current devel release $IMG_DISTRONAME"
+	fi
 
 	# Tag the DISTRONAME.
 	if [ -n "$FORCE" ] || ! grep -Fwq "${IMG_DISTRONAME}" <<< "${IMAGE_TAGS[@]}"; then
@@ -310,6 +321,11 @@ while [ -n "$1" ]; do
 	    shift
 	    ;;
 
+	"--dry-run")
+	    export DRY_RUN=1
+	    shift
+	    ;;
+
 	"-x"|"--exclude")
 	    EXCLUDE_IMAGES+=( "$2" )
 	    shift 2