addressing Felix's comments

Author: alexbondar92

pkg/controlplane/http/session.go

@@ -226,53 +226,22 @@ func (s *session) DeleteAccessKeySync(deleteAccessKeyInput *v3ioc.DeleteAccessKe
 		&deleteAccessKeyInput.ControlPlaneInput)
 }
 
-// DeleteAccessKeySync deletes an access key (blocking)
-func (s *session) GetUserNameSync(getUserNameInput *v3ioc.GetUserNameInput) (*v3ioc.GetUserNameOutput, error) {
+// GetRunningUserAttributesSync returns user's attributes related to session's access key (blocking)
+func (s *session) GetRunningUserAttributesSync(getRunningUserAttributesInput *v3ioc.GetRunningUserAttributesInput) (*v3ioc.GetRunningUserAttributesOutput, error) {
 
 	// prepare session response resource
-	userNameOutput := v3ioc.GetUserNameOutput{}
-
-	// allocate request
-	httpRequest := fasthttp.AcquireRequest()
-	defer fasthttp.ReleaseRequest(httpRequest)
+	userNameOutput := v3ioc.GetRunningUserAttributesOutput{}
 
-	responseInstance, err := s.sendRequest(getUserNameInput.ControlPlaneInput.Ctx,
-		&request{
-			method:      http.MethodGet,
-			path:        fmt.Sprintf("api/%s", "self"),
-			httpRequest: httpRequest,
-		}, getUserNameInput.ControlPlaneInput.Timeout)
+	err := s.getResource(getRunningUserAttributesInput.Ctx,
+		"self",
+		&getRunningUserAttributesInput.ControlPlaneInput,
+		&userNameOutput.ControlPlaneOutput,
+		&userNameOutput.UserAttributes)
 
 	if err != nil {
 		return nil, err
 	}
 
-	// if we got cookies, set them
-	if len(responseInstance.cookies) > 0 {
-		s.cookies = responseInstance.cookies
-	}
-
-	var objmap map[string]json.RawMessage
-	err = json.Unmarshal(responseInstance.body, &objmap)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal(objmap["data"], &objmap)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal(objmap["attributes"], &objmap)
-	if err != nil {
-		return nil, err
-	}
-
-	err = json.Unmarshal(objmap["username"], &userNameOutput.Username)
-	if err != nil {
-		return nil, err
-	}
-
 	return &userNameOutput, err
 }
 
@@ -386,6 +355,52 @@ func (s *session) createOrUpdateResource(ctx context.Context,
 	return nil
 }
 
+func (s *session) getResource(ctx context.Context,
+	path string,
+	controlPlaneInput *v3ioc.ControlPlaneInput,
+	controlPlaneOutput *v3ioc.ControlPlaneOutput,
+	responseAttributes interface{}) error {
+
+	// allocate request
+	httpRequest := fasthttp.AcquireRequest()
+	defer fasthttp.ReleaseRequest(httpRequest)
+
+	responseInstance, err := s.sendRequest(ctx,
+		&request{
+			method:      http.MethodGet,
+			path:        "api/" + path,
+			httpRequest: httpRequest,
+		}, controlPlaneInput.Timeout)
+
+	if err != nil {
+		return err
+	}
+
+	// unmarshal
+	if responseInstance.body != nil && controlPlaneOutput != nil {
+		responseBuffer := bytes.NewBuffer(responseInstance.body)
+
+		jsonAPIResponse := jsonapiResource{
+			Data: jsonapiData{
+				Attributes: responseAttributes,
+			},
+		}
+
+		if err := json.NewDecoder(responseBuffer).Decode(&jsonAPIResponse); err != nil {
+			return err
+		}
+
+		switch typedResponseID := jsonAPIResponse.Data.ID.(type) {
+		case string:
+			controlPlaneOutput.ID = typedResponseID
+		case float64:
+			controlPlaneOutput.IDNumeric = int(typedResponseID)
+		}
+	}
+
+	return nil
+}
+
 func (s *session) deleteResource(ctx context.Context,
 	path string,
 	kind string,

pkg/controlplane/test/controlplane_test.go

@@ -38,12 +38,13 @@ func (suite *githubClientSuite) SetupSuite() {
 	suite.Require().NoError(err, fmt.Sprintf("\nInput: %v\n", newSessionInput))
 
 	// create a unique user for the tests
+	username := fmt.Sprintf("testuser-%d", ts)
 	ts := time.Now().Unix()
 	createUserInput := v3ioc.CreateUserInput{}
 	createUserInput.Ctx = suite.ctx
 	createUserInput.FirstName = fmt.Sprintf("Test-%d", ts)
 	createUserInput.LastName = fmt.Sprintf("User-%d", ts)
-	createUserInput.Username = fmt.Sprintf("testuser-%d", ts)
+	createUserInput.Username = username
 	createUserInput.Password = fmt.Sprintf("testpasswd-%d", ts)
 	createUserInput.Email = fmt.Sprintf("testuser-%d@user.com", ts)
 	createUserInput.Description = "A user created from tests"
@@ -55,6 +56,13 @@ func (suite *githubClientSuite) SetupSuite() {
 	suite.Require().NotNil(createUserOutput.ID)
 	suite.userID = createUserOutput.ID
 
+	getRunningUserAttributesInput := v3ioc.GetRunningUserAttributesInput{}
+	getRunningUserAttributesInput.Ctx = suite.ctx
+
+	getRunningUserAttributesOutput, err := session.GetRunningUserAttributesSync(&getRunningUserAttributesInput)
+	suite.Require().NoError(err)
+	suite.Require().Equal(getRunningUserAttributesOutput.Username, username)
+
 	// create a session with that user
 	newSessionInput.Username = createUserInput.Username
 	newSessionInput.Password = createUserInput.Password
@@ -172,12 +180,6 @@ func (suite *githubClientSuite) TestCreateEventUsingAccessKey() {
 	err = accessKeySession.CreateEventSync(&createEventInput)
 	suite.Require().NoError(err)
 
-	getUserNameInput := v3ioc.GetUserNameInput{}
-	getUserNameInput.Ctx = suite.ctx
-
-	_, err = accessKeySession.GetUserNameSync(&getUserNameInput)
-	suite.Require().NoError(err)
-
 	// Delete access key
 	deleteAccessKeyInput := v3ioc.DeleteAccessKeyInput{}
 	deleteAccessKeyInput.ID = createAccessKeyOutput.ID

pkg/controlplane/types.go

@@ -47,8 +47,8 @@ type Session interface {
 	// DeleteAccessKeySync deletes an access key (blocking)
 	DeleteAccessKeySync(*DeleteAccessKeyInput) error
 
-	// GetUserNameSync returns username related to session's access key (blocking)
-	GetUserNameSync(*GetUserNameInput) (*GetUserNameOutput, error)
+	// GetRunningUserAttributesSync returns user's attributes related to session's access key (blocking)
+	GetRunningUserAttributesSync(*GetRunningUserAttributesInput) (*GetRunningUserAttributesOutput, error)
 }
 
 type ControlPlaneInput struct {
@@ -141,13 +141,13 @@ type DeleteAccessKeyInput struct {
 	ControlPlaneInput
 }
 
-// GetUserNameInput specifies what access key
-type GetUserNameInput struct {
+// GetRunningUserAttributesInput specifies what access key
+type GetRunningUserAttributesInput struct {
 	ControlPlaneInput
 }
 
-// GetUserNameOutput holds the response from get username
-type GetUserNameOutput struct {
+// GetRunningUserAttributesOutput holds the response from get user's attributes
+type GetRunningUserAttributesOutput struct {
 	ControlPlaneOutput
-	Username string
+	UserAttributes
 }