Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

feat(provisionersdk): allow variadic tags in provisionersdk.MutateTags#15518

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
johnstcn merged 3 commits intomainfromcj/15087-provisionertags-mutate-variadic
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from1 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
PrevPrevious commit
address PR comments
  • Loading branch information
@johnstcn
johnstcn committedNov 15, 2024
commit70de358c5ee6b19e99d2f1b7f394c91c8aebf155
9 changes: 3 additions & 6 deletionsprovisionersdk/provisionertags.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,12 +42,9 @@ func MutateTags(userID uuid.UUID, provided ...map[string]string) map[string]stri
return tags
}

// mergeTags merges multiple sets of provisioner tags.
// Given maps a and b, the result will contain all
// keys and values contained in a and in b.
// An exception is made for key-value pairs for which
// a[key] is non-empty but b[key] is empty. In this case
// the non-empty value from a will win.
// mergeTags merges two sets of provisioner tags.
// If b[key] is an empty string, the value from a[key] is retained.
// This function handles nil maps gracefully.
func mergeTags(a, b map[string]string) map[string]string {
m := make(map[string]string)
for k, v := range a {
Expand Down
90 changes: 49 additions & 41 deletionsprovisionersdk/provisionertags_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@ package provisionersdk_test
import (
"testing"

"github.com/coder/coder/v2/coderd/util/slice"
"github.com/coder/coder/v2/provisionersdk"

"github.com/google/uuid"
Expand DownExpand Up@@ -33,17 +32,17 @@ func TestMutateTags(t *testing.T) {
{
name: "empty tags",
userID: uuid.Nil,
tags:slice.New(map[string]string{}),
tags:[]map[string]string{{}},
want: map[string]string{
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
provisionersdk.TagOwner: "",
},
},
{
name: "user scope",
tags:slice.New(
map[string]string{provisionersdk.TagScope: provisionersdk.ScopeUser},
),
tags:[]map[string]string{
{provisionersdk.TagScope: provisionersdk.ScopeUser},
},
userID: testUserID,
want: map[string]string{
provisionersdk.TagScope: provisionersdk.ScopeUser,
Expand All@@ -52,9 +51,9 @@ func TestMutateTags(t *testing.T) {
},
{
name: "organization scope",
tags:slice.New(
map[string]string{provisionersdk.TagScope: provisionersdk.ScopeOrganization},
),
tags:[]map[string]string{
{provisionersdk.TagScope: provisionersdk.ScopeOrganization},
},
userID: testUserID,
want: map[string]string{
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
Expand All@@ -63,12 +62,12 @@ func TestMutateTags(t *testing.T) {
},
{
name: "organization scope with owner",
tags:slice.New(
map[string]string{
tags:[]map[string]string{
{
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
provisionersdk.TagOwner: testUserID.String(),
},
),
},
userID: uuid.Nil,
want: map[string]string{
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
Expand All@@ -77,11 +76,11 @@ func TestMutateTags(t *testing.T) {
},
{
name: "owner tag with no other context",
tags:slice.New(
map[string]string{
tags:[]map[string]string{
{
provisionersdk.TagOwner: testUserID.String(),
},
),
},
userID: uuid.Nil,
want: map[string]string{
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
Expand All@@ -90,9 +89,9 @@ func TestMutateTags(t *testing.T) {
},
{
name: "invalid scope",
tags:slice.New(
map[string]string{provisionersdk.TagScope: "360noscope"},
),
tags:[]map[string]string{
{provisionersdk.TagScope: "360noscope"},
},
userID: testUserID,
want: map[string]string{
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
Expand All@@ -101,10 +100,10 @@ func TestMutateTags(t *testing.T) {
},
{
name: "merge two empty maps",
tags:slice.New(
map[string]string{},
map[string]string{},
),
tags:[]map[string]string{
{},
{},
},
userID: testUserID,
want: map[string]string{
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
Expand All@@ -113,10 +112,10 @@ func TestMutateTags(t *testing.T) {
},
{
name: "merge empty map with non-empty map",
tags:slice.New(
map[string]string{},
map[string]string{"foo": "bar"},
),
tags:[]map[string]string{
{},
{"foo": "bar"},
},
userID: testUserID,
want: map[string]string{
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
Expand All@@ -126,10 +125,10 @@ func TestMutateTags(t *testing.T) {
},
{
name: "merge non-empty map with empty map",
tags:slice.New(
map[string]string{"foo": "bar"},
map[string]string{},
),
tags:[]map[string]string{
{"foo": "bar"},
{},
},
userID: testUserID,
want: map[string]string{
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
Expand All@@ -139,10 +138,10 @@ func TestMutateTags(t *testing.T) {
},
{
name: "merge map with same map",
tags:slice.New(
map[string]string{"foo": "bar"},
map[string]string{"foo": "bar"},
),
tags:[]map[string]string{
{"foo": "bar"},
{"foo": "bar"},
},
userID: testUserID,
want: map[string]string{
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
Expand All@@ -152,10 +151,10 @@ func TestMutateTags(t *testing.T) {
},
{
name: "merge map with override",
tags:slice.New(
map[string]string{"foo": "bar"},
map[string]string{"foo": "baz"},
),
tags:[]map[string]string{
{"foo": "bar"},
{"foo": "baz"},
},
userID: testUserID,
want: map[string]string{
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
Expand All@@ -165,17 +164,26 @@ func TestMutateTags(t *testing.T) {
},
{
name: "do not override empty in second map",
tags:slice.New(
map[string]string{"foo": "bar"},
map[string]string{"foo": ""},
),
tags:[]map[string]string{
{"foo": "bar"},
{"foo": ""},
},
userID: testUserID,
want: map[string]string{
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
provisionersdk.TagOwner: "",
"foo": "bar",
},
},
{
name: "merge nil map with nil map",
tags: []map[string]string{nil, nil},
userID: testUserID,
want: map[string]string{
provisionersdk.TagScope: provisionersdk.ScopeOrganization,
provisionersdk.TagOwner: "",
},
},
} {
tt := tt
t.Run(tt.name, func(t *testing.T) {
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp