Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add image/blob tagging functionality to ore #3915

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 71 additions & 0 deletions mantle/cmd/ore/aliyun/tag-image.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
// Copyright 2017 CoreOS, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package aliyun

import (
"fmt"
"os"
"strings"

"github.com/spf13/cobra"
)

var (
cmdTagImage = &cobra.Command{
Use: "tag-image --id <id> --tags foo=bar ...",
Short: "Tag an image",
Run: runTagImage,
}
id string
tags []string
region string
)

func init() {
// Initialize the command and its flags
Aliyun.AddCommand(cmdTagImage)
cmdTagImage.Flags().StringVar(&id, "id", "", "Aliyun Image ID")
cmdTagImage.Flags().StringVar(&region, "region", "", "Region")
cmdTagImage.Flags().StringSliceVar(&tags, "tags", []string{}, "list of key=value tags to attach to the Aliyun image")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be good to add --tags to ore aliyun create-image too for consistency.

Similarly for GCP and Azure.

For cost reporting purposes, I would expect us actually to want to set the tags on upload instead of as a postprocess step.

}

func runTagImage(cmd *cobra.Command, args []string) {
if id == "" {
fmt.Fprintf(os.Stderr, "Provide --id to tag\n")
os.Exit(1)
}

if region == "" {
fmt.Fprintf(os.Stderr, "Provide --region\n")
os.Exit(1)
}

tagMap := make(map[string]string)
for _, tag := range tags {
splitTag := strings.SplitN(tag, "=", 2)
if len(splitTag) != 2 {
fmt.Fprintf(os.Stderr, "invalid tag format; should be key=value, not %v\n", tag)
os.Exit(1)
}
key, value := splitTag[0], splitTag[1]
tagMap[key] = value
}

err := API.CreateTags(id, tagMap, region)
if err != nil {
fmt.Fprintf(os.Stderr, "couldn't create image tags: %v", err)
os.Exit(1)
}
}
26 changes: 26 additions & 0 deletions mantle/platform/api/aliyun/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,32 @@ func (a *API) DeleteImage(id string, force bool) error {
return errs.AsError()
}

func (a *API) CreateTags(resource string, tags map[string]string, region string) error {
request := ecs.CreateAddTagsRequest()
request.SetConnectTimeout(defaultConnectTimeout)
request.SetReadTimeout(defaultReadTimeout)
request.ResourceId = resource
request.RegionId = region
request.ResourceType = "image"

tagObjs := make([]ecs.AddTagsTag, 0, len(tags))
for key, value := range tags {
tagObjs = append(tagObjs, ecs.AddTagsTag{
Key: key,
Value: value,
})
}

request.Tag = &tagObjs
response, err := a.ecs.AddTags(request)
plog.Infof("response %v", response)
if err != nil {
return fmt.Errorf("unable to add tags: %v", err)
}

return err
}

// DeleteSnapshot deletes a snapshot
func (a *API) DeleteSnapshot(id string, force bool) error {
request := ecs.CreateDeleteSnapshotRequest()
Expand Down