CyberCoveLLC/threshold
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(server): refactor worker tags (#5445)

Browse Source 
* refactor(server): refactor worker tags
This commit is contained in:
Irena Rindos authored and GitHub committed 2025-01-22 13:03:55 -05:00
1 parent e2102f65dd
commit dfe4f91be3
9 files changed
+148 -104
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/daemon/cluster/handlers/worker_service_test.go
+22 -34
View File
@@ -1316,17 +1316,14 @@ func TestRoutingInfo(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, w1.Address, "2.3.4.5:8080")
expTags := []*server.Tag{
{Key: "tag1", Value: "value1"},
{Key: "tag2", Value: "value2"},
expTags := server.Tags{
"tag1": []string{"value1"},
"tag2": []string{"value2"},
}
assert.Equal(t, len(expTags), len(w1.ConfigTags))
for k, v := range expTags {
assert.ElementsMatch(t, v, w1.ConfigTags[k])
}
assert.Empty(
t,
cmp.Diff(
w1.ConfigTags,
server.Tags(expTags),
),
)
assert.Equal(t, w1.ReleaseVersion, "Boundary v0.18.0")
assert.EqualValues(t, w1.OperationalState, server.ActiveOperationalState)
assert.EqualValues(t, w1.LocalStorageState, server.AvailableLocalStorageState)
@@ -1346,13 +1343,10 @@ func TestRoutingInfo(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, w1.Address, "2.3.4.5:8080")
assert.Empty(
t,
cmp.Diff(
w1.ConfigTags,
server.Tags(expTags),
),
)
assert.Equal(t, len(expTags), len(w1.ConfigTags))
for k, v := range expTags {
assert.ElementsMatch(t, v, w1.ConfigTags[k])
}
assert.Equal(t, w1.ReleaseVersion, "Boundary v0.18.0")
assert.EqualValues(t, w1.OperationalState, server.ActiveOperationalState)
assert.EqualValues(t, w1.LocalStorageState, server.AvailableLocalStorageState)
@@ -1389,17 +1383,14 @@ func TestRoutingInfo(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, w3.Address, "2.3.4.5:8080")
expTags := []*server.Tag{
{Key: "tag1", Value: "value1"},
{Key: "tag2", Value: "value2"},
expTags := server.Tags{
"tag1": []string{"value1"},
"tag2": []string{"value2"},
}
assert.Equal(t, len(expTags), len(w3.ConfigTags))
for k, v := range expTags {
assert.ElementsMatch(t, v, w3.ConfigTags[k])
}
assert.Empty(
t,
cmp.Diff(
w3.ConfigTags,
server.Tags(expTags),
),
)
assert.Equal(t, w3.ReleaseVersion, "Boundary v0.18.0")
assert.EqualValues(t, w3.OperationalState, server.ActiveOperationalState)
assert.EqualValues(t, w3.LocalStorageState, server.AvailableLocalStorageState)
@@ -1419,13 +1410,10 @@ func TestRoutingInfo(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, w3.Address, "2.3.4.5:8080")
assert.Empty(
t,
cmp.Diff(
w3.ConfigTags,
server.Tags(expTags),
),
)
assert.Equal(t, len(expTags), len(w3.ConfigTags))
for k, v := range expTags {
assert.ElementsMatch(t, v, w3.ConfigTags[k])
}
assert.Equal(t, w3.ReleaseVersion, "Boundary v0.18.0")
assert.EqualValues(t, w3.OperationalState, server.ActiveOperationalState)
assert.EqualValues(t, w3.LocalStorageState, server.AvailableLocalStorageState)
internal/daemon/controller/handlers/workers/worker_service.go
+4 -4
View File
@@ -905,16 +905,16 @@ func (s Service) toProto(ctx context.Context, in *server.Worker, opt ...handlers
if outputFields.Has(globals.ControllerGeneratedActivationToken) && in.ControllerGeneratedActivationToken != "" {
out.ControllerGeneratedActivationToken = &wrapperspb.StringValue{Value: in.ControllerGeneratedActivationToken}
}
if outputFields.Has(globals.ConfigTagsField) && len(in.GetConfigTags()) > 0 {
if outputFields.Has(globals.ConfigTagsField) && len(in.ConfigTags) > 0 {
var err error
out.ConfigTags, err = tagsToMapProto(in.GetConfigTags())
out.ConfigTags, err = tagsToMapProto(in.ConfigTags)
if err != nil {
return nil, errors.Wrap(ctx, err, op, errors.WithMsg("error preparing config tags proto"))
}
}
if outputFields.Has(globals.ApiTagsField) && len(in.GetApiTags()) > 0 {
if outputFields.Has(globals.ApiTagsField) && len(in.ApiTags) > 0 {
var err error
out.ApiTags, err = tagsToMapProto(in.GetApiTags())
out.ApiTags, err = tagsToMapProto(in.ApiTags)
if err != nil {
return nil, errors.Wrap(ctx, err, op, errors.WithMsg("error preparing api tags proto"))
}