Merge pull request #170 from buildkite/chore_testify_lint

chore: enable testify lint to make things tidy

Author: wolfeidau

.golangci.yml

@@ -8,6 +8,7 @@ linters:
     - unused
     - gosec
     - gocritic
+    - testifylint
   exclusions:
     generated: lax
     presets:
@@ -34,6 +35,12 @@ formatters:
           replacement: "any"
         - pattern: "a[b:len(a)]"
           replacement: "a[b:]"
+    testifylint:
+      disable-all: true
+      enable:
+        - require-error
+        - useless-assert
+        - len
   exclusions:
     generated: lax
     paths:

pkg/buildkite/access_token_test.go

@@ -63,5 +63,5 @@ func TestAccessToken(t *testing.T) {
 
 	textContent := getTextResult(t, result)
 
-	assert.Equal(`{"uuid":"123","scopes":["read_build","read_pipeline"],"description":"Test token","created_at":"2023-01-01T00:00:00Z","user":{"name":"Test User","email":"[email protected]"}}`, textContent.Text)
+	assert.JSONEq(`{"uuid":"123","scopes":["read_build","read_pipeline"],"description":"Test token","created_at":"2023-01-01T00:00:00Z","user":{"name":"Test User","email":"[email protected]"}}`, textContent.Text)
 }

pkg/buildkite/annotations_test.go

@@ -59,5 +59,5 @@ func TestListAnnotations(t *testing.T) {
 	assert.NoError(err)
 	textContent := getTextResult(t, result)
 
-	assert.Equal(`{"headers":{"Link":""},"items":[{"id":"1","body_html":"Test annotation 1"},{"id":"2","body_html":"Test annotation 2"}]}`, textContent.Text)
+	assert.JSONEq(`{"headers":{"Link":""},"items":[{"id":"1","body_html":"Test annotation 1"},{"id":"2","body_html":"Test annotation 2"}]}`, textContent.Text)
 }

pkg/buildkite/builds_test.go

@@ -570,10 +570,10 @@ func TestCreateBuild(t *testing.T) {
 		CreateFunc: func(ctx context.Context, org string, pipeline string, b buildkite.CreateBuild) (buildkite.Build, *buildkite.Response, error) {
 
 			// Validate required fields
-			assert.Equal(org, "org")
-			assert.Equal(pipeline, "pipeline")
-			assert.Equal(b.Commit, "abc123")
-			assert.Equal(b.Message, "Test build")
+			assert.Equal("org", org)
+			assert.Equal("pipeline", pipeline)
+			assert.Equal("abc123", b.Commit)
+			assert.Equal("Test build", b.Message)
 
 			// Return created build
 			return buildkite.Build{
@@ -619,7 +619,7 @@ func TestCreateBuild(t *testing.T) {
 	assert.NoError(err)
 
 	textContent := getTextResult(t, result)
-	assert.Equal(`{"id":"123","number":1,"state":"created","blocked":false,"author":{},"env":{"ENV_VAR":"value"},"created_at":"0001-01-01T00:00:00Z","meta_data":{"meta_key":"meta_value"},"creator":{"avatar_url":"","created_at":null,"email":"","id":"","name":""}}`, textContent.Text)
+	assert.JSONEq(`{"id":"123","number":1,"state":"created","blocked":false,"author":{},"env":{"ENV_VAR":"value"},"created_at":"0001-01-01T00:00:00Z","meta_data":{"meta_key":"meta_value"},"creator":{"avatar_url":"","created_at":null,"email":"","id":"","name":""}}`, textContent.Text)
 }
 
 func TestCalculatePercentage(t *testing.T) {

pkg/buildkite/cluster_queue_test.go

@@ -59,7 +59,7 @@ func TestListClusterQueues(t *testing.T) {
 	assert.NoError(err)
 
 	textContent := getTextResult(t, result)
-	assert.Equal(`{"headers":{"Link":""},"items":[{"id":"queue-id","dispatch_paused":false,"created_by":{}}]}`, textContent.Text)
+	assert.JSONEq(`{"headers":{"Link":""},"items":[{"id":"queue-id","dispatch_paused":false,"created_by":{}}]}`, textContent.Text)
 }
 
 func TestGetClusterQueue(t *testing.T) {
@@ -91,5 +91,5 @@ func TestGetClusterQueue(t *testing.T) {
 	assert.NoError(err)
 
 	textContent := getTextResult(t, result)
-	assert.Equal("{\"id\":\"queue-id\",\"dispatch_paused\":false,\"created_by\":{}}", textContent.Text)
+	assert.JSONEq("{\"id\":\"queue-id\",\"dispatch_paused\":false,\"created_by\":{}}", textContent.Text)
 }

pkg/buildkite/clusters_test.go

@@ -59,7 +59,7 @@ func TestListClusters(t *testing.T) {
 	assert.NoError(err)
 
 	textContent := getTextResult(t, result)
-	assert.Equal(`{"headers":{"Link":""},"items":[{"id":"cluster-id","name":"cluster-name","created_by":{}}]}`, textContent.Text)
+	assert.JSONEq(`{"headers":{"Link":""},"items":[{"id":"cluster-id","name":"cluster-name","created_by":{}}]}`, textContent.Text)
 }
 
 func TestGetCluster(t *testing.T) {
@@ -91,5 +91,5 @@ func TestGetCluster(t *testing.T) {
 	assert.NoError(err)
 
 	textContent := getTextResult(t, result)
-	assert.Equal("{\"id\":\"cluster-id\",\"name\":\"cluster-name\",\"created_by\":{}}", textContent.Text)
+	assert.JSONEq("{\"id\":\"cluster-id\",\"name\":\"cluster-name\",\"created_by\":{}}", textContent.Text)
 }

pkg/buildkite/organizations_test.go

@@ -49,7 +49,7 @@ func TestUserTokenOrganization(t *testing.T) {
 
 	textContent := getTextResult(t, result)
 
-	assert.Equal(`{"name":"Test Organization","slug":"test-org"}`, textContent.Text)
+	assert.JSONEq(`{"name":"Test Organization","slug":"test-org"}`, textContent.Text)
 }
 
 func TestUserTokenOrganizationError(t *testing.T) {

pkg/buildkite/pipelines_test.go

@@ -91,7 +91,7 @@ func TestListPipelines(t *testing.T) {
 
 	textContent := getTextResult(t, result)
 
-	assert.Equal(`{"headers":{"Link":""},"items":[{"id":"123","name":"Test Pipeline","slug":"test-pipeline","repository":"","default_branch":"","web_url":"","visibility":"","created_at":"0001-01-01T00:00:00Z"}]}`, textContent.Text)
+	assert.JSONEq(`{"headers":{"Link":""},"items":[{"id":"123","name":"Test Pipeline","slug":"test-pipeline","repository":"","default_branch":"","web_url":"","visibility":"","created_at":"0001-01-01T00:00:00Z"}]}`, textContent.Text)
 }
 
 func TestGetPipeline(t *testing.T) {
@@ -129,7 +129,7 @@ func TestGetPipeline(t *testing.T) {
 
 	textContent := getTextResult(t, result)
 
-	assert.Equal(`{"id":"123","name":"Test Pipeline","slug":"test-pipeline","created_at":"0001-01-01T00:00:00Z","skip_queued_branch_builds":false,"cancel_running_branch_builds":false,"provider":{"id":"","webhook_url":"","settings":null}}`, textContent.Text)
+	assert.JSONEq(`{"id":"123","name":"Test Pipeline","slug":"test-pipeline","created_at":"0001-01-01T00:00:00Z","skip_queued_branch_builds":false,"cancel_running_branch_builds":false,"provider":{"id":"","webhook_url":"","settings":null}}`, textContent.Text)
 }
 
 func TestCreatePipeline(t *testing.T) {
@@ -417,5 +417,5 @@ steps:
 	result, err := handler(ctx, request, args)
 	assert.NoError(err)
 	textContent := getTextResult(t, result)
-	assert.Equal(`{"id":"123","name":"Test Pipeline","slug":"test-pipeline","created_at":"0001-01-01T00:00:00Z","skip_queued_branch_builds":false,"cancel_running_branch_builds":false,"cluster_id":"abc-123","tags":["tag1","tag2"],"provider":{"id":"","webhook_url":"","settings":null}}`, textContent.Text)
+	assert.JSONEq(`{"id":"123","name":"Test Pipeline","slug":"test-pipeline","created_at":"0001-01-01T00:00:00Z","skip_queued_branch_builds":false,"cancel_running_branch_builds":false,"cluster_id":"abc-123","tags":["tag1","tag2"],"provider":{"id":"","webhook_url":"","settings":null}}`, textContent.Text)
 }

pkg/buildkite/user_test.go

@@ -50,5 +50,5 @@ func TestCurrentUser(t *testing.T) {
 
 	textContent := getTextResult(t, result)
 
-	assert.Equal(`{"id":"123","name":"Test User","email":"[email protected]","created_at":"0001-01-01T00:00:00Z"}`, textContent.Text)
+	assert.JSONEq(`{"id":"123","name":"Test User","email":"[email protected]","created_at":"0001-01-01T00:00:00Z"}`, textContent.Text)
 }