refactor: reorganize code

Signed-off-by: 1998-felix <felix.gateru@gmail.com>
absmach · Jun 26, 2024 · f4b66d9 · f4b66d9
1 parent d0ac1ef
commit f4b66d9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/pkg/sdk/go/domains.go b/pkg/sdk/go/domains.go
@@ -52,16 +52,16 @@ func (sdk mgSDK) CreateDomain(domain Domain, token string) (Domain, errors.SDKEr
 }
 
 func (sdk mgSDK) UpdateDomain(domain Domain, token string) (Domain, errors.SDKError) {
-	data, err := json.Marshal(domain)
-	if err != nil {
-		return Domain{}, errors.NewSDKError(err)
-	}
-
 	if domain.ID == "" {
 		return Domain{}, errors.NewSDKError(apiutil.ErrMissingID)
 	}
 	url := fmt.Sprintf("%s/%s/%s", sdk.domainsURL, domainsEndpoint, domain.ID)
 
+	data, err := json.Marshal(domain)
+	if err != nil {
+		return Domain{}, errors.NewSDKError(err)
+	}
+
 	_, body, sdkerr := sdk.processRequest(http.MethodPatch, url, token, data, nil, http.StatusOK)
 	if sdkerr != nil {
 		return Domain{}, sdkerr

diff --git a/pkg/sdk/go/domains_test.go b/pkg/sdk/go/domains_test.go
@@ -40,7 +40,7 @@ var (
 		Tags:     sdkDomain.Tags,
 		Alias:    sdkDomain.Alias,
 	}
-	updatedName = "updated-domain"
+	updatedDomianName = "updated-domain"
 )
 
 func setupDomains() (*httptest.Server, *authmocks.Service) {
@@ -177,9 +177,9 @@ func TestUpdateDomain(t *testing.T) {
 	mgsdk := sdk.NewSDK(sdkConf)
 
 	upDomainSDK := sdkDomain
-	upDomainSDK.Name = updatedName
+	upDomainSDK.Name = updatedDomianName
 	upDomainAuth := authDomain
-	upDomainAuth.Name = updatedName
+	upDomainAuth.Name = updatedDomianName
 
 	cases := []struct {
 		desc     string
@@ -197,7 +197,7 @@ func TestUpdateDomain(t *testing.T) {
 			domainID: sdkDomain.ID,
 			domain: sdk.Domain{
 				ID:   sdkDomain.ID,
-				Name: updatedName,
+				Name: updatedDomianName,
 			},
 			svcRes:   upDomainAuth,
 			svcErr:   nil,
@@ -210,7 +210,7 @@ func TestUpdateDomain(t *testing.T) {
 			domainID: sdkDomain.ID,
 			domain: sdk.Domain{
 				ID:   sdkDomain.ID,
-				Name: updatedName,
+				Name: updatedDomianName,
 			},
 			svcRes:   auth.Domain{},
 			svcErr:   svcerr.ErrAuthentication,
@@ -223,7 +223,7 @@ func TestUpdateDomain(t *testing.T) {
 			domainID: sdkDomain.ID,
 			domain: sdk.Domain{
 				ID:   sdkDomain.ID,
-				Name: updatedName,
+				Name: updatedDomianName,
 			},
 			svcRes:   auth.Domain{},
 			svcErr:   nil,
@@ -236,7 +236,7 @@ func TestUpdateDomain(t *testing.T) {
 			domainID: wrongID,
 			domain: sdk.Domain{
 				ID:   wrongID,
-				Name: updatedName,
+				Name: updatedDomianName,
 			},
 			svcRes:   auth.Domain{},
 			svcErr:   svcerr.ErrAuthorization,