Skip to content

APIGW Normalize Status Conditions #16994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jm96441n merged 28 commits into from
Apr 24, 2023
Merged

APIGW Normalize Status Conditions #16994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
c777004
normalize status conditions for gateways and routes
jm96441n Apr 13, 2023
eb62bef
Added tests for checking condition status and panic conditions for
jm96441n Apr 13, 2023
bb50b96
get rid of unneeded gateway condition generator struct
jm96441n Apr 13, 2023
2659a06
Remove unused file
jm96441n Apr 13, 2023
b84cd21
run go mod tidy
jm96441n Apr 13, 2023
740a4e5
Update tests, add conflicted gateway status
jm96441n Apr 13, 2023
8a8662b
put back removed status for test
jm96441n Apr 13, 2023
8864986
Fix linting violation, remove custom conflicted status
jm96441n Apr 13, 2023
01a39fb
Update fsm commands oss
jm96441n Apr 13, 2023
b9f369a
Fix incorrect combination of type/condition/status
jm96441n Apr 13, 2023
1b6a5b6
cleaning up from PR review
jm96441n Apr 13, 2023
7129105
Change "invalidCertificate" to be of accepted status
jm96441n Apr 17, 2023
c6f1615
Move status condition enums into api package
jm96441n Apr 18, 2023
fa978fd
Update gateways controller and generated code
jm96441n Apr 18, 2023
11d59a3
Update conditions in fsm oss tests
jm96441n Apr 18, 2023
d26c63a
run go mod tidy on consul-container module to fix linting
jm96441n Apr 18, 2023
519acc4
Fix type for gateway endpoint test
jm96441n Apr 18, 2023
2da0633
go mod tidy from changes to api
jm96441n Apr 18, 2023
c1686a9
go mod tidy on troubleshoot
jm96441n Apr 18, 2023
3c7df32
Fix route conflicted reason
jm96441n Apr 18, 2023
0b3ec3a
fix route conflict reason rename
jm96441n Apr 18, 2023
9277645
Fix text for gateway conflicted status
jm96441n Apr 18, 2023
6dc16c9
Merge branch 'main' into jm96441n/normalize-status-conditions
jm96441n Apr 19, 2023
1be474f
Merge branch 'main' into jm96441n/normalize-status-conditions
jm96441n Apr 19, 2023
67fb620
Merge branch 'main' into jm96441n/normalize-status-conditions
jm96441n Apr 20, 2023
eb3b997
Merge branch 'main' into jm96441n/normalize-status-conditions
jm96441n Apr 24, 2023
d83a09c
Add valid certificate ref condition setting
jm96441n Apr 24, 2023
f1fa81a
Revert change to resolved refs to be handled in future PR
jm96441n Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions agent/consul/fsm/commands_oss_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ import (
"testing"
"time"

"github.com/hashicorp/go-raftchunking"
raftchunkingtypes "github.com/hashicorp/go-raftchunking/types"
"github.com/hashicorp/go-uuid"
"github.com/hashicorp/raft"
"github.com/hashicorp/serf/coordinate"
"github.com/mitchellh/mapstructure"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand All @@ -34,6 +29,11 @@ import (
"github.com/hashicorp/consul/proto/private/prototest"
"github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/consul/types"
"github.com/hashicorp/go-raftchunking"
raftchunkingtypes "github.com/hashicorp/go-raftchunking/types"
"github.com/hashicorp/go-uuid"
"github.com/hashicorp/raft"
"github.com/hashicorp/serf/coordinate"
)

func generateUUID() (ret string) {
Expand Down Expand Up @@ -1372,9 +1372,10 @@ func TestFSM_ConfigEntry_StatusCAS(t *testing.T) {
EnterpriseMeta: *structs.DefaultEnterpriseMetaInDefaultPartition(),
Status: structs.Status{
Conditions: []structs.Condition{{
Status: "Foo",
Status: string(api.ConditionStatusTrue),
}},
}}
},
}

// Create a new request.
req := &structs.ConfigEntryRequest{
Expand Down Expand Up @@ -1403,7 +1404,7 @@ func TestFSM_ConfigEntry_StatusCAS(t *testing.T) {
// do a status update
entry.Status = structs.Status{
Conditions: []structs.Condition{{
Status: "Foo",
Status: string(api.ConditionStatusTrue),
}},
}
req = &structs.ConfigEntryRequest{
Expand All @@ -1427,7 +1428,7 @@ func TestFSM_ConfigEntry_StatusCAS(t *testing.T) {
entry.RaftIndex.ModifyIndex = 2
conditions := config.(*structs.APIGatewayConfigEntry).Status.Conditions
require.Len(t, conditions, 1)
require.Equal(t, "Foo", conditions[0].Status)
require.Equal(t, string(api.ConditionStatusTrue), conditions[0].Status)
}

// attempt to change the status with a regular update and make sure it's ignored
Expand Down Expand Up @@ -1456,7 +1457,7 @@ func TestFSM_ConfigEntry_StatusCAS(t *testing.T) {
require.NoError(t, err)
conditions := config.(*structs.APIGatewayConfigEntry).Status.Conditions
require.Len(t, conditions, 1)
require.Equal(t, "Foo", conditions[0].Status)
require.Equal(t, string(api.ConditionStatusTrue), conditions[0].Status)
}
}

Expand Down
80 changes: 0 additions & 80 deletions agent/consul/fsm_data_store.go
View file
Open in desktop

This file was deleted.

Loading