Skip to content
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.

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

Add docs, examples and tests for jwt-provider config entry and jwt referencing intentions #349

Merged
merged 1 commit into from
Jul 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ jobs:
run: make test
- name: Run OSS acceptance tests
run: |
curl -LO https://releases.hashicorp.com/consul/1.15.2/consul_1.15.2_linux_amd64.zip
sudo unzip consul_1.15.2_linux_amd64.zip consul -d /usr/local/bin
curl -LO https://releases.hashicorp.com/consul/1.16.0/consul_1.16.0_linux_amd64.zip
sudo unzip consul_1.16.0_linux_amd64.zip consul -d /usr/local/bin
SKIP_REMOTE_DATACENTER_TESTS=1 make testacc TESTARGS="-count=1"
- name: Run go vet
run: make vet
146 changes: 143 additions & 3 deletions consul/resource_consul_config_entry_ce_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,21 +78,24 @@ func TestAccConsulConfigEntryCE_basic(t *testing.T) {
),
},
{
Config: testAccConsulConfigEntryCE_ServiceConfigL4,
Config: testAccConsulConfigEntryCE_ServiceConfigL4,
ExpectNonEmptyPlan: true,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("consul_config_entry.service_intentions", "name", "api-service"),
resource.TestCheckResourceAttr("consul_config_entry.service_intentions", "kind", "service-intentions"),
),
},
{
Config: testAccConsulConfigEntryCE_ServiceConfigL7,
Config: testAccConsulConfigEntryCE_ServiceConfigL7,
ExpectNonEmptyPlan: true,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("consul_config_entry.service_intentions", "name", "fort-knox"),
resource.TestCheckResourceAttr("consul_config_entry.service_intentions", "kind", "service-intentions"),
),
},
{
Config: testAccConsulConfigEntryCE_ServiceConfigL7b,
Config: testAccConsulConfigEntryCE_ServiceConfigL7b,
ExpectNonEmptyPlan: true,
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("consul_config_entry.service_intentions", "name", "api"),
resource.TestCheckResourceAttr("consul_config_entry.service_intentions", "kind", "service-intentions"),
Expand Down Expand Up @@ -172,6 +175,48 @@ func TestAccConsulConfigEntryCE_Mesh(t *testing.T) {
})
}

func TestAccConsulConfigEntryCE_JWTProvider_Remote(t *testing.T) {
providers, _ := startTestServer(t)

resource.Test(t, resource.TestCase{
PreCheck: func() { skipTestOnConsulEnterpriseEdition(t) },
Providers: providers,
Steps: []resource.TestStep{
{
Config: TestAccConsulConfigEntryCE_jwtRemote,
ExpectNonEmptyPlan: true,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("consul_config_entry.jwt_provider", "id", "jwt-provider-okta"),
resource.TestCheckResourceAttr("consul_config_entry.jwt_provider", "name", "okta"),
resource.TestCheckResourceAttr("consul_config_entry.jwt_provider", "kind", "jwt-provider"),
resource.TestCheckResourceAttr("consul_config_entry.jwt_provider", "config_json", "{\"ClockSkewSeconds\":30,\"Forwarding\":{\"HeaderName\":\"test-token\"},\"Issuer\":\"test-issuer\",\"JSONWebKeySet\":{\"Remote\":{\"FetchAsynchronously\":true,\"URI\":\"https://127.0.0.1:9091\"}}}"),
),
},
},
})
}

func TestAccConsulConfigEntryCE_JWTProvider_Local(t *testing.T) {
providers, _ := startTestServer(t)

resource.Test(t, resource.TestCase{
PreCheck: func() { skipTestOnConsulEnterpriseEdition(t) },
Providers: providers,
Steps: []resource.TestStep{
{
ExpectNonEmptyPlan: true,
Config: TestAccConsulConfigEntryCE_jwtLocal,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr("consul_config_entry.jwt_provider", "id", "jwt-provider-auth0"),
resource.TestCheckResourceAttr("consul_config_entry.jwt_provider", "name", "auth0"),
resource.TestCheckResourceAttr("consul_config_entry.jwt_provider", "kind", "jwt-provider"),
resource.TestCheckResourceAttr("consul_config_entry.jwt_provider", "config_json", "{\"ClockSkewSeconds\":30,\"Issuer\":\"auth0-issuer\",\"JSONWebKeySet\":{\"Local\":{\"JWKS\":\"eyJrZXlzIjogW3sKICAiY3J2IjogIlAtMjU2IiwKICAia2V5X29wcyI6IFsKICAgICJ2ZXJpZnkiCiAgXSwKICAia3R5IjogIkVDIiwKICAieCI6ICJXYzl1WnVQYUI3S2gyRk1jOXd0SmpSZThYRDR5VDJBWU5BQWtyWWJWanV3IiwKICAieSI6ICI2OGhSVEppSk5Pd3RyaDRFb1BYZVZuUnVIN2hpU0RKX2xtYmJqZkRmV3EwIiwKICAiYWxnIjogIkVTMjU2IiwKICAidXNlIjogInNpZyIsCiAgImtpZCI6ICJhYzFlOGY5MGVkZGY2MWM0MjljNjFjYTA1YjRmMmUwNyIKfV19\"}}}"),
),
},
},
})
}

const testAccConsulConfigEntryCE_ServiceDefaults = `
resource "consul_config_entry" "foo" {
name = "foo"
Expand Down Expand Up @@ -395,11 +440,31 @@ resource "consul_config_entry" "terminating_gateway" {
`

const testAccConsulConfigEntryCE_ServiceConfigL4 = `
resource "consul_config_entry" "jwt_provider" {
name = "okta"
kind = "jwt-provider"

config_json = jsonencode({
Issuer = "test-issuer"
JSONWebKeySet = {
Remote = {
URI = "https://127.0.0.1:9091"
FetchAsynchronously = true
}
}
})
}

resource "consul_config_entry" "service_intentions" {
name = "api-service"
kind = "service-intentions"

config_json = jsonencode({
JWT = {
Providers = [
{ name = consul_config_entry.jwt_provider.name }
]
}
Sources = [
{
Action = "allow"
Expand Down Expand Up @@ -431,6 +496,21 @@ resource "consul_config_entry" "sd" {
})
}

resource "consul_config_entry" "jwt_provider" {
name = "okta"
kind = "jwt-provider"

config_json = jsonencode({
Issuer = "test-issuer"
JSONWebKeySet = {
Remote = {
URI = "https://127.0.0.1:9091"
FetchAsynchronously = true
}
}
})
}

resource "consul_config_entry" "service_intentions" {
name = consul_config_entry.sd.name
kind = "service-intentions"
Expand All @@ -446,6 +526,11 @@ resource "consul_config_entry" "service_intentions" {
Methods = ["GET", "HEAD"]
PathExact = "/healtz"
}
JWT = {
Providers = [
{ name = consul_config_entry.jwt_provider.name }
]
}
}
]
Precedence = 9
Expand Down Expand Up @@ -488,6 +573,21 @@ resource "consul_config_entry" "sd" {
})
}

resource "consul_config_entry" "jwt_provider" {
name = "okta"
kind = "jwt-provider"

config_json = jsonencode({
Issuer = "test-issuer"
JSONWebKeySet = {
Remote = {
URI = "https://127.0.0.1:9091"
FetchAsynchronously = true
}
}
})
}

resource "consul_config_entry" "service_intentions" {
name = consul_config_entry.sd.name
kind = "service-intentions"
Expand All @@ -503,6 +603,11 @@ resource "consul_config_entry" "service_intentions" {
Methods = ["GET", "PUT", "POST", "DELETE", "HEAD"]
PathPrefix = "/v2"
}
JWT = {
Providers = [
{ name = consul_config_entry.jwt_provider.name }
]
}
}
],
Precedence = 9
Expand Down Expand Up @@ -701,3 +806,38 @@ resource "consul_config_entry" "mesh" {
})
}
`
const TestAccConsulConfigEntryCE_jwtRemote = `
resource "consul_config_entry" "jwt_provider" {
name = "okta"
kind = "jwt-provider"

config_json = jsonencode({
Issuer = "test-issuer"
JSONWebKeySet = {
Remote = {
URI = "https://127.0.0.1:9091"
FetchAsynchronously = true
}
}
Forwarding = {
HeaderName = "test-token"
}
})
}
`

const TestAccConsulConfigEntryCE_jwtLocal = `
resource "consul_config_entry" "jwt_provider" {
name = "auth0"
kind = "jwt-provider"

config_json = jsonencode({
Issuer = "auth0-issuer"
JSONWebKeySet = {
Local = {
JWKS = "eyJrZXlzIjogW3sKICAiY3J2IjogIlAtMjU2IiwKICAia2V5X29wcyI6IFsKICAgICJ2ZXJpZnkiCiAgXSwKICAia3R5IjogIkVDIiwKICAieCI6ICJXYzl1WnVQYUI3S2gyRk1jOXd0SmpSZThYRDR5VDJBWU5BQWtyWWJWanV3IiwKICAieSI6ICI2OGhSVEppSk5Pd3RyaDRFb1BYZVZuUnVIN2hpU0RKX2xtYmJqZkRmV3EwIiwKICAiYWxnIjogIkVTMjU2IiwKICAidXNlIjogInNpZyIsCiAgImtpZCI6ICJhYzFlOGY5MGVkZGY2MWM0MjljNjFjYTA1YjRmMmUwNyIKfV19"
}
}
})
}
`
Loading