Skip to content

Commit

Permalink
Resolve linting errors
Browse files Browse the repository at this point in the history
  • Loading branch information
mheap committed Jan 28, 2025
1 parent b734021 commit 120df79
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
1 change: 0 additions & 1 deletion cmd/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,6 @@ func performDiff(ctx context.Context, currentState, targetState *state.KongState
dry bool, parallelism int, delay int, client *kong.Client, isKonnect bool,
enableJSONOutput bool, applyType ApplyType,
) (int, error) {

shouldSkipDeletes := applyType == ApplyTypePartial

s, err := diff.NewSyncer(diff.SyncerOpts{
Expand Down
7 changes: 5 additions & 2 deletions tests/integration/apply_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ func Test_Apply_3x(t *testing.T) {
runWhen(t, "kong", ">=3.0.0")
setup(t)

apply(context.Background(), "testdata/apply/007-update-existing-entity/service-01.yaml")
err := apply(context.Background(), "testdata/apply/007-update-existing-entity/service-01.yaml")
require.NoError(t, err, "failed to apply service-01")

out, err := dump()
require.NoError(t, err)
Expand All @@ -95,7 +96,9 @@ func Test_Apply_3x(t *testing.T) {

assert.Equal(t, expectedOriginal, out)

apply(context.Background(), "testdata/apply/007-update-existing-entity/service-02.yaml")
err = apply(context.Background(), "testdata/apply/007-update-existing-entity/service-02.yaml")
require.NoError(t, err, "failed to apply service-02")

expectedChanged, err := readFile("testdata/apply/007-update-existing-entity/expected-state-02.yaml")
require.NoError(t, err, "failed to read expected state")

Expand Down

0 comments on commit 120df79

Please sign in to comment.