Merge branch 'main' into add-client-sendconfig

Kong · Dec 15, 2022 · b98c50c · b98c50c
2 parents 33232c1 + 9a0b9ec
commit b98c50c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/integration-test-enterprise.yaml b/.github/workflows/integration-test-enterprise.yaml
@@ -78,6 +78,7 @@ jobs:
         with:
           name: codecov-${{ matrix.kong_version }}
           flags: ${{ matrix.kong_version }},integration,enterprise
+          token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
 
   test-enterprise-passed:

diff --git a/.github/workflows/integration-test.yaml b/.github/workflows/integration-test.yaml
@@ -50,6 +50,7 @@ jobs:
         with:
           name: codecov-${{ matrix.kong_version }}
           flags: ${{ matrix.kong_version }},integration,community
+          token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
 
   test-passed:

diff --git a/kong/target_service_test.go b/kong/target_service_test.go
@@ -2,6 +2,7 @@ package kong
 
 import (
 	"testing"
+	"time"
 
 	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
@@ -261,7 +262,14 @@ func TestTargetMarkHealthy(T *testing.T) {
 
 	assert.NotNil(client.Targets.MarkHealthy(defaultCtx, createdTarget.Upstream.ID, nil))
 	assert.NotNil(client.Targets.MarkHealthy(defaultCtx, nil, createdTarget))
-	assert.NoError(client.Targets.MarkHealthy(defaultCtx, createdTarget.Upstream.ID, createdTarget))
+	assert.Eventually(func() bool {
+		err := client.Targets.MarkHealthy(defaultCtx, createdTarget.Upstream.ID, createdTarget)
+		if err != nil {
+			T.Logf("failed marking target %s healthy", *createdTarget.ID)
+			return false
+		}
+		return true
+	}, 5*time.Second, 100*time.Millisecond)
 
 	assert.NoError(client.Upstreams.Delete(defaultCtx, createdUpstream.ID))
 }
@@ -300,7 +308,15 @@ func TestTargetMarkUnhealthy(T *testing.T) {
 
 	assert.NotNil(client.Targets.MarkUnhealthy(defaultCtx, createdTarget.Upstream.ID, nil))
 	assert.NotNil(client.Targets.MarkUnhealthy(defaultCtx, nil, createdTarget))
-	assert.NoError(client.Targets.MarkUnhealthy(defaultCtx, createdTarget.Upstream.ID, createdTarget))
+
+	assert.Eventually(func() bool {
+		err := client.Targets.MarkUnhealthy(defaultCtx, createdTarget.Upstream.ID, createdTarget)
+		if err != nil {
+			T.Logf("failed marking target %s healthy", *createdTarget.ID)
+			return false
+		}
+		return true
+	}, 5*time.Second, 100*time.Millisecond)
 
 	assert.NoError(client.Upstreams.Delete(defaultCtx, createdUpstream.ID))
 }