feat: Allow using multiple tags

Also allow pointing to sha256 digest when --new-tag is used.

Fixes #16

Author: kichik

handler.go

@@ -37,7 +37,7 @@ const (
 	artifactsDbName    = "artifacts.db"
 )
 
-func indexAndPush(ctx context.Context, repo string, tag string, newTag string, registryUrl string, authToken string) (string, error) {
+func indexAndPush(ctx context.Context, repo string, tag string, newTags []string, registryUrl string, authToken string) (string, error) {
 	ctx = context.WithValue(ctx, "RegistryURL", registryUrl)
 
 	registry, err := registryutils.Init(ctx, registryUrl, authToken)
@@ -86,11 +86,18 @@ func indexAndPush(ctx context.Context, repo string, tag string, newTag string, r
 		}
 		ctx = context.WithValue(ctx, "SOCIIndexDigest", indexDescriptor.Digest.String())
 
-		err = registry.Push(ctx, sociStore, *indexDescriptor, repo, newTag)
+		err = registry.Push(ctx, sociStore, *indexDescriptor, repo)
 		if err != nil {
 			return logAndReturnError(ctx, PushFailedMessage, err)
 		}
 
+		for _, newTag := range newTags {
+			err = registry.Tag(ctx, *indexDescriptor, repo, newTag)
+			if err != nil {
+				return logAndReturnError(ctx, PushFailedMessage, err)
+			}
+		}
+
 		log.Info(ctx, BuildAndPushSuccessMessage)
 	}
 	return BuildAndPushSuccessMessage, nil

main.go

@@ -20,8 +20,8 @@ var (
 )
 
 var (
-	auth   string
-	newTag string
+	auth    string
+	newTags []string
 )
 
 func parseImageDesc(desc string) (repo, tag, registry string, err error) {
@@ -52,8 +52,8 @@ func main() {
 				os.Exit(1)
 			}
 
-			if strings.Contains(tag, ":") {
-				log.Error(ctx, "Tag cannot be a digest", nil)
+			if strings.Contains(tag, ":") && len(newTags) == 0 {
+				log.Error(ctx, "Tag cannot be a digest without --new-tag", nil)
 				os.Exit(1)
 			}
 
@@ -62,21 +62,21 @@ func main() {
 				os.Exit(1)
 			}
 
-			if newTag == "" {
-				newTag = tag
+			if len(newTags) == 0 {
+				newTags = append(newTags, tag)
 			}
 
-			log.Info(ctx, fmt.Sprintf("Indexing %s:%s and pushing with tag %s to %s", repo, tag, newTag, registry))
+			log.Info(ctx, fmt.Sprintf("Indexing %s:%s and pushing with tags %s to %s", repo, tag, newTags, registry))
 
-			_, err = indexAndPush(ctx, repo, tag, newTag, registry, auth)
+			_, err = indexAndPush(ctx, repo, tag, newTags, registry, auth)
 			if err != nil {
 				os.Exit(1)
 			}
 		},
 	}
 
 	rootCmd.Flags().StringVarP(&auth, "auth", "a", "", "Registry authentication token (usually USER:PASSWORD)")
-	rootCmd.Flags().StringVarP(&newTag, "new-tag", "t", "", "Push indexed image with this tag")
+	rootCmd.Flags().StringArrayVarP(&newTags, "new-tag", "t", nil, "Push indexed image with this tag")
 
 	if err := rootCmd.Execute(); err != nil {
 		_, _ = fmt.Fprintln(os.Stderr, err)

utils/registry/registry.go

@@ -98,7 +98,7 @@ func (registry *Registry) Pull(ctx context.Context, repositoryName string, sociS
 // Push a OCI artifact to remote registry
 // descriptor: ocispec Descriptor of the artifact
 // ociStore: the local OCI store
-func (registry *Registry) Push(ctx context.Context, sociStore *store.SociStore, indexDesc ocispec.Descriptor, repositoryName, tag string) error {
+func (registry *Registry) Push(ctx context.Context, sociStore *store.SociStore, indexDesc ocispec.Descriptor, repositoryName string) error {
 	log.Info(ctx, "Pushing artifact")
 
 	repo, err := registry.registry.Repository(ctx, repositoryName)
@@ -116,12 +116,19 @@ func (registry *Registry) Push(ctx context.Context, sociStore *store.SociStore,
 		return err
 	}
 
-	if tag != "" {
-		log.Info(ctx, fmt.Sprintf("Tagging index with %s", tag))
-		err = repo.Tag(ctx, indexDesc, tag)
-		if err != nil {
-			return fmt.Errorf("failed to tag artifact: %w", err)
-		}
+	return nil
+}
+
+func (registry *Registry) Tag(ctx context.Context, indexDesc ocispec.Descriptor, repositoryName, tag string) error {
+	repo, err := registry.registry.Repository(ctx, repositoryName)
+	if err != nil {
+		return err
+	}
+
+	log.Info(ctx, fmt.Sprintf("Tagging index with %s", tag))
+	err = repo.Tag(ctx, indexDesc, tag)
+	if err != nil {
+		return fmt.Errorf("failed to tag artifact: %w", err)
 	}
 
 	return nil