Skip to content

Commit

Permalink
Merge pull request #73 from mamclaughlin/userdataFeature
Browse files Browse the repository at this point in the history
remove encoding for user data input
  • Loading branch information
ddymko authored Aug 22, 2020
2 parents da44f60 + 5e6ad07 commit 1273851
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 8 deletions.
4 changes: 1 addition & 3 deletions bare_metal_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -767,11 +767,9 @@ func (b *BareMetalServerServiceHandler) SetTag(ctx context.Context, serverID, ta
func (b *BareMetalServerServiceHandler) SetUserData(ctx context.Context, serverID, userData string) error {
uri := "/v1/baremetal/set_user_data"

encodedUserData := base64.StdEncoding.EncodeToString([]byte(userData))

values := url.Values{
"SUBID": {serverID},
"userdata": {encodedUserData},
"userdata": {userData},
}

req, err := b.client.NewRequest(ctx, http.MethodPost, uri, values)
Expand Down
2 changes: 1 addition & 1 deletion bare_metal_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -854,7 +854,7 @@ func TestBareMetalServerServiceHandler_SetUserData(t *testing.T) {
fmt.Fprint(writer)
})

err := client.BareMetalServer.SetUserData(ctx, "900000", "user-test-data")
err := client.BareMetalServer.SetUserData(ctx, "900000", "ZWNobyBIZWxsbyBXb3JsZA==")

if err != nil {
t.Errorf("Server.SetUserData return %+v ", err)
Expand Down
4 changes: 1 addition & 3 deletions server.go
Original file line number Diff line number Diff line change
Expand Up @@ -790,11 +790,9 @@ func (s *ServerServiceHandler) SetUserData(ctx context.Context, instanceID, user

uri := "/v1/server/set_user_data"

encodedUserData := base64.StdEncoding.EncodeToString([]byte(userData))

values := url.Values{
"SUBID": {instanceID},
"userdata": {encodedUserData},
"userdata": {userData},
}

req, err := s.client.NewRequest(ctx, http.MethodPost, uri, values)
Expand Down
2 changes: 1 addition & 1 deletion server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ func TestServerServiceHandler_SetUserData(t *testing.T) {
fmt.Fprint(writer)
})

err := client.Server.SetUserData(ctx, "1234", "user-test-data")
err := client.Server.SetUserData(ctx, "1234", "ZWNobyBIZWxsbyBXb3JsZA==")

if err != nil {
t.Errorf("Server.SetUserData return %+v ", err)
Expand Down

0 comments on commit 1273851

Please sign in to comment.