Logging: fix crashing test

philips-software · Feb 6, 2023 · 24bb96b · 24bb96b
1 parent fd024ae
commit 24bb96b
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 28 deletions.
diff --git a/iam/groups_service.go b/iam/groups_service.go
@@ -173,17 +173,16 @@ func (g *GroupsService) roleAction(ctx context.Context, group Group, role Role,
 	var assignRequest = groupRequest{
 		Roles: []string{role.ID},
 	}
-	req, err := g.client.newRequest(IDM, "POST", "authorize/identity/Group/"+group.ID+"/"+action, assignRequest, nil)
-	if err != nil {
-		return false, nil, err
-	}
-	req.Header.Set("api-version", groupAPIVersion)
-	req.Header.Set("Content-Type", "application/json")
-
 	var assignResponse interface{}
 	var resp *Response
 
-	err = internal.TryHTTPCall(ctx, 6, func() (*http.Response, error) {
+	err := internal.TryHTTPCall(ctx, 6, func() (*http.Response, error) {
+		req, err := g.client.newRequest(IDM, "POST", "authorize/identity/Group/"+group.ID+"/"+action, assignRequest, nil)
+		if err != nil {
+			return nil, err
+		}
+		req.Header.Set("api-version", groupAPIVersion)
+		req.Header.Set("Content-Type", "application/json")
 		resp, err = g.client.do(req, &assignResponse)
 		if resp == nil {
 			return nil, err
@@ -233,17 +232,17 @@ type groupRequest struct {
 }
 
 func (g *GroupsService) memberAction(ctx context.Context, group Group, action string, opt interface{}, options []OptionFunc) (map[string]interface{}, *Response, error) {
-	req, err := g.client.newRequest(IDM, "POST", "authorize/identity/Group/"+group.ID+"/"+action, opt, options)
-	if err != nil {
-		return nil, nil, err
-	}
-	req.Header.Set("api-version", groupAPIVersion)
-	req.Header.Set("Content-Type", "application/json")
-
 	var memberResponse map[string]interface{}
 	var resp *Response
 
-	err = internal.TryHTTPCall(ctx, 6, func() (*http.Response, error) {
+	err := internal.TryHTTPCall(ctx, 6, func() (*http.Response, error) {
+		req, err := g.client.newRequest(IDM, "POST", "authorize/identity/Group/"+group.ID+"/"+action, opt, options)
+		if err != nil {
+			return nil, err
+		}
+		req.Header.Set("api-version", groupAPIVersion)
+		req.Header.Set("Content-Type", "application/json")
+
 		resp, err = g.client.do(req, &memberResponse)
 		if resp == nil {
 			return nil, err

diff --git a/internal/version.go b/internal/version.go
@@ -1,5 +1,5 @@
 package internal
 
 const (
-	LibraryVersion = "0.78.6"
+	LibraryVersion = "0.78.7"
 )
diff --git a/logging/client.go b/logging/client.go
@@ -130,6 +130,13 @@ type CustomIndexBody []struct {
 	Fieldtype string `json:"fieldtype"`
 }
 
+func (r *StoreResponse) StatusCode() int {
+	if r.Response != nil {
+		return r.Response.StatusCode
+	}
+	return 0
+}
+
 // NewClient returns an instance of the logger client with the given Config
 func NewClient(httpClient *http.Client, config *Config) (*Client, error) {
 	var logger Client

diff --git a/logging/client_test.go b/logging/client_test.go
@@ -175,8 +175,8 @@ func TestStoreResources(t *testing.T) {
 		t.Errorf("Unexpected nil value for response")
 		return
 	}
-	if resp.StatusCode != http.StatusCreated {
-		t.Errorf("Expected HTTP 201, Got: %d", resp.StatusCode)
+	if resp.StatusCode() != http.StatusCreated {
+		t.Errorf("Expected HTTP 201, Got: %d", resp.StatusCode())
 	}
 }
 
@@ -207,8 +207,8 @@ func TestStoreResourcesWithInvalidKey(t *testing.T) {
 		t.Errorf("Unexpected nil value for response")
 		return
 	}
-	if resp.StatusCode != http.StatusUnprocessableEntity {
-		t.Errorf("Expected HTTP %d, Got: %d", http.StatusUnprocessableEntity, resp.StatusCode)
+	if resp.StatusCode() != http.StatusUnprocessableEntity {
+		t.Errorf("Expected HTTP %d, Got: %d", http.StatusUnprocessableEntity, resp.StatusCode())
 	}
 }
 
@@ -237,7 +237,7 @@ func TestStoreResourcesWithInvalidKeypair(t *testing.T) {
 	}
 	assert.NotNil(t, resp)
 	_ = err.Error() // Just to up coverage
-	assert.Equal(t, http.StatusForbidden, resp.StatusCode)
+	assert.Equal(t, http.StatusForbidden, resp.StatusCode())
 	assert.NotNil(t, err)
 }
 
@@ -346,7 +346,7 @@ func TestStoreResourcesWithBadResources(t *testing.T) {
 	if !assert.NotNil(t, resp) {
 		return
 	}
-	assert.Equal(t, http.StatusBadRequest, resp.StatusCode)
+	assert.Equal(t, http.StatusBadRequest, resp.StatusCode())
 	assert.Equal(t, ErrBatchErrors, err)
 }
 
@@ -448,8 +448,8 @@ func TestStoreResourceWithBearerToken(t *testing.T) {
 		t.Errorf("Unexpected nil value for response")
 		return
 	}
-	if resp.StatusCode != http.StatusCreated {
-		t.Errorf("Expected HTTP 201, Got: %d", resp.StatusCode)
+	if resp.StatusCode() != http.StatusCreated {
+		t.Errorf("Expected HTTP 201, Got: %d", resp.StatusCode())
 	}
 }
 

diff --git a/logging/integration_test.go b/logging/integration_test.go
@@ -31,6 +31,19 @@ func TestIntegration(t *testing.T) {
 	productKey := os.Getenv("INT_LOGGING_PRODUCT_KEY")
 	ingestorURL := os.Getenv("INT_LOGGING_INGESTOR_URL")
 
+	if !assert.NotEmpty(t, key) {
+		return
+	}
+	if !assert.NotEmpty(t, secret) {
+		return
+	}
+	if !assert.NotEmpty(t, productKey) {
+		return
+	}
+	if !assert.NotEmpty(t, ingestorURL) {
+		return
+	}
+
 	intClient, err := NewClient(nil, &Config{
 		SharedKey:    key,
 		SharedSecret: secret,
@@ -53,7 +66,7 @@ func TestIntegration(t *testing.T) {
 	if !assert.NotNil(t, resp) {
 		return
 	}
-	assert.Equal(t, http.StatusCreated, resp.StatusCode)
+	assert.Equal(t, http.StatusCreated, resp.StatusCode())
 
 	// Local validation test
 	resp, err = intClient.StoreResources([]Resource{
@@ -67,10 +80,11 @@ func TestIntegration(t *testing.T) {
 	if !assert.NotNil(t, err) {
 		return
 	}
-	assert.Equal(t, ErrBatchErrors, err)
 	if !assert.NotNil(t, resp) {
 		return
 	}
-	assert.Equal(t, http.StatusBadRequest, resp.StatusCode)
+	assert.Equal(t, ErrBatchErrors, err)
+
+	assert.Equal(t, http.StatusBadRequest, resp.StatusCode())
 	assert.Equal(t, 3, len(resp.Failed))
 }