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

fix: #1197 update terraform IDP config to manual enter endpoints #1202

Merged
merged 5 commits into from
Feb 15, 2024
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
12 changes: 12 additions & 0 deletions infrastructure/server/oidc_idp_bceid_business.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ resource "aws_cognito_identity_provider" "dev_bceid_business_oidc_provider" {
client_secret = var.dev_oidc_bceid_business_idp_client_secret
oidc_issuer = var.dev_oidc_idp_issuer
attributes_request_method = "GET"
authorize_url = "${var.dev_oidc_idp_issuer}/protocol/openid-connect/auth"
token_url = "${var.dev_oidc_idp_issuer}/protocol/openid-connect/token"
attributes_url = "${var.dev_oidc_idp_issuer}/protocol/openid-connect/userinfo"
jwks_uri = "${var.dev_oidc_idp_issuer}/protocol/openid-connect/certs"
}

attribute_mapping = {
Expand All @@ -36,6 +40,10 @@ resource "aws_cognito_identity_provider" "test_bceid_business_oidc_provider" {
client_secret = var.test_oidc_bceid_business_idp_client_secret
oidc_issuer = var.test_oidc_idp_issuer
attributes_request_method = "GET"
authorize_url = "${var.test_oidc_idp_issuer}/protocol/openid-connect/auth"
token_url = "${var.test_oidc_idp_issuer}/protocol/openid-connect/token"
attributes_url = "${var.test_oidc_idp_issuer}/protocol/openid-connect/userinfo"
jwks_uri = "${var.test_oidc_idp_issuer}/protocol/openid-connect/certs"
}

attribute_mapping = {
Expand Down Expand Up @@ -64,6 +72,10 @@ resource "aws_cognito_identity_provider" "prod_bceid_business_oidc_provider" {
client_secret = var.prod_oidc_bceid_business_idp_client_secret
oidc_issuer = var.prod_oidc_idp_issuer
attributes_request_method = "GET"
authorize_url = "${var.prod_oidc_idp_issuer}/protocol/openid-connect/auth"
token_url = "${var.prod_oidc_idp_issuer}/protocol/openid-connect/token"
attributes_url = "${var.prod_oidc_idp_issuer}/protocol/openid-connect/userinfo"
jwks_uri = "${var.prod_oidc_idp_issuer}/protocol/openid-connect/certs"
}

attribute_mapping = {
Expand Down
14 changes: 13 additions & 1 deletion infrastructure/server/oidc_idp_idir.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ resource "aws_cognito_identity_provider" "dev_idir_oidc_provider" {
client_secret = var.dev_oidc_idir_idp_client_secret
oidc_issuer = var.dev_oidc_idp_issuer
attributes_request_method = "GET"
authorize_url = "${var.dev_oidc_idp_issuer}/protocol/openid-connect/auth"
token_url = "${var.dev_oidc_idp_issuer}/protocol/openid-connect/token"
attributes_url = "${var.dev_oidc_idp_issuer}/protocol/openid-connect/userinfo"
jwks_uri = "${var.dev_oidc_idp_issuer}/protocol/openid-connect/certs"
}

attribute_mapping = {
Expand All @@ -34,6 +38,10 @@ resource "aws_cognito_identity_provider" "test_idir_oidc_provider" {
client_secret = var.test_oidc_idir_idp_client_secret
oidc_issuer = var.test_oidc_idp_issuer
attributes_request_method = "GET"
authorize_url = "${var.test_oidc_idp_issuer}/protocol/openid-connect/auth"
token_url = "${var.test_oidc_idp_issuer}/protocol/openid-connect/token"
attributes_url = "${var.test_oidc_idp_issuer}/protocol/openid-connect/userinfo"
jwks_uri = "${var.test_oidc_idp_issuer}/protocol/openid-connect/certs"
}

attribute_mapping = {
Expand All @@ -58,6 +66,10 @@ resource "aws_cognito_identity_provider" "prod_idir_oidc_provider" {
client_secret = var.prod_oidc_idir_idp_client_secret
oidc_issuer = var.prod_oidc_idp_issuer
attributes_request_method = "GET"
authorize_url = "${var.prod_oidc_idp_issuer}/protocol/openid-connect/auth"
token_url = "${var.prod_oidc_idp_issuer}/protocol/openid-connect/token"
attributes_url = "${var.prod_oidc_idp_issuer}/protocol/openid-connect/userinfo"
jwks_uri = "${var.prod_oidc_idp_issuer}/protocol/openid-connect/certs"
}

attribute_mapping = {
Expand All @@ -70,4 +82,4 @@ resource "aws_cognito_identity_provider" "prod_idir_oidc_provider" {
"custom:keycloak_username" = "preferred_username"
}

}
}
1 change: 0 additions & 1 deletion infrastructure/server/variables_provided.tf
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,6 @@ variable "prod_oidc_bcsc_idp_client_id" {
default = "not.yet.implemented"
}


# Networking Variables
variable "subnet_data_a" {
description = "Value of the name tag for a subnet in the DATA security group"
Expand Down
Loading