Removed StatusCode return value and use renamed auth methods

SUSE · Jan 15, 2025 · fcc1ec6 · fcc1ec6
1 parent 8197702
commit fcc1ec6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/pkg/registration/activate.go b/pkg/registration/activate.go
@@ -62,9 +62,9 @@ func Activate(conn connection.Connection, identifier, version, arch, regcode str
 		return nil, nil, buildErr
 	}
 
-	connection.AuthBySystemCredentials(request, login, password)
+	connection.AddSystemAuth(request, login, password)
 
-	_, response, doErr := conn.Do(request)
+	response, doErr := conn.Do(request)
 	if doErr != nil {
 		return nil, nil, doErr
 	}
@@ -105,9 +105,9 @@ func Deactivate(conn connection.Connection, identifier, version, arch string) (*
 		return nil, nil, buildErr
 	}
 
-	connection.AuthBySystemCredentials(request, login, password)
+	connection.AddSystemAuth(request, login, password)
 
-	_, response, doErr := conn.Do(request)
+	response, doErr := conn.Do(request)
 	if doErr != nil {
 		return nil, nil, doErr
 	}

diff --git a/pkg/registration/activate_test.go b/pkg/registration/activate_test.go
@@ -16,7 +16,7 @@ func TestActivateProductSuccess(t *testing.T) {
 
 	// 204 No Content
 	payload := fixture(t, "pkg/registration/activate_success.json")
-	conn.On("Do", mock.Anything).Return(200, payload, nil)
+	conn.On("Do", mock.Anything).Return(payload, nil)
 
 	metadata, product, err := registration.Activate(conn, "SLES", "12.1", "x86_64", "regcode")
 	assert.NoError(err)
@@ -31,7 +31,7 @@ func TestActivateProductInvalidRegcode(t *testing.T) {
 	conn, _ := mockConnectionWithCredentials()
 
 	// 204 No Content
-	conn.On("Do", mock.Anything).Return(422, []byte{}, errors.New("No valid subscription found"))
+	conn.On("Do", mock.Anything).Return([]byte{}, errors.New("No valid subscription found"))
 
 	_, _, err := registration.Activate(conn, "SLES", "12.1", "x86_64", "regcode")
 	assert.Error(err)
@@ -44,7 +44,7 @@ func TestDeactivateProductSuccess(t *testing.T) {
 
 	// 204 No Content
 	payload := fixture(t, "pkg/registration/deactivate_success.json")
-	conn.On("Do", mock.Anything).Return(200, payload, nil)
+	conn.On("Do", mock.Anything).Return(payload, nil)
 
 	metadata, product, err := registration.Deactivate(conn, "SLES", "12.1", "x86_64")
 	assert.NoError(err)
@@ -59,7 +59,7 @@ func TestDeactivateProductInvalidProduct(t *testing.T) {
 	conn, _ := mockConnectionWithCredentials()
 
 	// 204 No Content
-	conn.On("Do", mock.Anything).Return(422, []byte{}, errors.New("Product is a base product and cannot be deactivated"))
+	conn.On("Do", mock.Anything).Return([]byte{}, errors.New("Product is a base product and cannot be deactivated"))
 
 	_, _, err := registration.Deactivate(conn, "SLES", "12.1", "x86_64")
 	assert.Error(err)

diff --git a/pkg/registration/product.go b/pkg/registration/product.go
@@ -81,9 +81,9 @@ func FetchProductInfo(conn connection.Connection, identifier, version, arch stri
 		return nil, buildErr
 	}
 
-	connection.AuthBySystemCredentials(request, login, password)
+	connection.AddSystemAuth(request, login, password)
 
-	_, response, doErr := conn.Do(request)
+	response, doErr := conn.Do(request)
 	if doErr != nil {
 		return nil, doErr
 	}

diff --git a/pkg/registration/product_test.go b/pkg/registration/product_test.go
@@ -95,7 +95,7 @@ func TestFetchProductInfo(t *testing.T) {
 	login, password, _ := creds.Login()
 
 	payload := fixture(t, "pkg/registration/product_tree.json")
-	conn.On("Do", mock.Anything).Return(200, payload, nil).Run(checkAuthBySystemCredentials(t, login, password))
+	conn.On("Do", mock.Anything).Return(payload, nil).Run(checkAuthBySystemCredentials(t, login, password))
 
 	product, err := registration.FetchProductInfo(conn, "SLES", "15.5", "x86_64")
 	assert.NoError(err)