Skip to content

Commit b84b6c5

Browse files
authored
fix(kafka_topic): pass server errors to basic controller for proper retries (#1014)
1 parent e671f04 commit b84b6c5

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ jobs:
5353
go-version-file: go.mod
5454
- run: make test-tag tag=${{ matrix.name }}
5555
env:
56-
AIVEN_DEBUG: ${{ secrets.AIVEN_DEBUG }}
56+
AIVEN_DEBUG: ${{ vars.AIVEN_DEBUG || 'false' }}
57+
ENABLE_DEBUG_LOGGING: ${{ vars.ENABLE_DEBUG_LOGGING || 'false' }}
5758
AIVEN_TOKEN: ${{ secrets.AIVEN_TOKEN }}
5859
AIVEN_ACCOUNT_ID: ${{ secrets.AIVEN_ACCOUNT_ID }}
5960
AIVEN_PROJECT_NAME: >-

controllers/kafkatopic_controller.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,8 @@ func (h KafkaTopicHandler) createOrUpdate(ctx context.Context, avnGen avngen.Cli
9191
}
9292
}
9393

94-
switch {
95-
case isServerError(err):
96-
// Service is not ready yet, retry later.
97-
return nil
98-
case err != nil:
99-
return err
94+
if err != nil {
95+
return fmt.Errorf("failed to create Kafka Topic: %w", err)
10096
}
10197

10298
return nil

controllers/serviceuser_controller.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@ func (h *ServiceUserHandler) get(ctx context.Context, avnGen avngen.Client, obj
158158
// Outer controller must be able to detect error types like "server error".
159159
retry.LastErrorOnly(true),
160160
)
161+
if err != nil {
162+
return nil, err
163+
}
161164

162165
s, err := avnGen.ServiceGet(ctx, user.Spec.Project, user.Spec.ServiceName)
163166
if err != nil {

0 commit comments

Comments
 (0)