Skip to content

Commit

Permalink
formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
paullatzelsperger committed Jul 10, 2024
1 parent 0108f89 commit 73a43b0
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions deployment/consumer.tf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
module "consumer-connector" {
source = "./modules/connector"
humanReadableName = "consumer"
participantId = var.consumer-did
participantId = var.consumer-did
database = {
user = "consumer"
password = "consumer"
Expand Down Expand Up @@ -49,7 +49,7 @@ module "consumer-identityhub" {
module "consumer-vault" {
source = "./modules/vault"
humanReadableName = "consumer-vault"
namespace = kubernetes_namespace.ns.metadata.0.name
namespace = kubernetes_namespace.ns.metadata.0.name
}

# Postgres database for the consumer
Expand Down
2 changes: 1 addition & 1 deletion deployment/modules/catalog-server/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ variable "participant-did" {
}

variable "namespace" {
type = string
type = string
}

variable "ports" {
Expand Down
12 changes: 6 additions & 6 deletions deployment/modules/connector/services.tf
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ resource "kubernetes_service" "controlplane-service" {
name = "debug"
port = var.ports.debug
}
port{
port {
name = "control"
port = var.ports.control
}
Expand All @@ -56,20 +56,20 @@ resource "kubernetes_service" "controlplane-service" {

resource "kubernetes_service" "dataplane-service" {
metadata {
name = local.dataplane-service-name
name = local.dataplane-service-name
namespace = var.namespace
}
spec{
spec {
type = "NodePort"
selector = {
App = kubernetes_deployment.dataplane.spec.0.template.0.metadata[0].labels.App
}
port{
port {
name = "control"
port = var.ports.control
}
port{
name="public"
port {
name = "public"
port = var.ports.public
}
}
Expand Down
4 changes: 2 additions & 2 deletions deployment/modules/connector/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ variable "participantId" {
}

variable "namespace" {
type = string
type = string
}

variable "ports" {
Expand Down Expand Up @@ -98,7 +98,7 @@ variable "aliases" {
}

locals {
name = lower(var.humanReadableName)
name = lower(var.humanReadableName)
controlplane-service-name = "${var.humanReadableName}-controlplane"
dataplane-service-name = "${var.humanReadableName}-dataplane"
}
2 changes: 1 addition & 1 deletion deployment/modules/identity-hub/identityhub.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

resource "kubernetes_deployment" "identityhub" {
metadata {
name = lower(var.humanReadableName)
name = lower(var.humanReadableName)
namespace = var.namespace
labels = {
App = lower(var.humanReadableName)
Expand Down
2 changes: 1 addition & 1 deletion deployment/modules/identity-hub/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ variable "participantId" {
}

variable "namespace" {
type = string
type = string
}

variable "ports" {
Expand Down
2 changes: 1 addition & 1 deletion deployment/modules/vault/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ variable "humanReadableName" {
}

variable "namespace" {
type = string
type = string
}

variable "vault-token" {
Expand Down
22 changes: 11 additions & 11 deletions deployment/provider.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
module "provider-qna-connector" {
source = "./modules/connector"
humanReadableName = "provider-qna"
participantId = var.provider-did
participantId = var.provider-did
database = {
user = "qna"
password = "provider-qna"
Expand All @@ -33,7 +33,7 @@ module "provider-qna-connector" {
module "provider-manufacturing-connector" {
source = "./modules/connector"
humanReadableName = "provider-manufacturing"
participantId = var.provider-did
participantId = var.provider-did
database = {
user = "manufacturing"
password = "provider-manufacturing"
Expand All @@ -44,14 +44,14 @@ module "provider-manufacturing-connector" {
}

module "provider-identityhub" {
depends_on = [module.provider-vault]
source = "./modules/identity-hub"
credentials-dir = dirname("./assets/credentials/k8s/provider/")
depends_on = [module.provider-vault]
source = "./modules/identity-hub"
credentials-dir = dirname("./assets/credentials/k8s/provider/")
humanReadableName = "provider-identityhub" # must be named "bob-identityhub" until we regenerate DIDs and credentials
participantId = var.provider-did
vault-url = "http://provider-vault:8200"
service-name = "provider"
namespace = kubernetes_namespace.ns.metadata.0.name
participantId = var.provider-did
vault-url = "http://provider-vault:8200"
service-name = "provider"
namespace = kubernetes_namespace.ns.metadata.0.name

database = {
user = "identityhub"
Expand All @@ -78,12 +78,12 @@ module "provider-catalog-server" {
module "provider-vault" {
source = "./modules/vault"
humanReadableName = "provider-vault"
namespace = kubernetes_namespace.ns.metadata.0.name
namespace = kubernetes_namespace.ns.metadata.0.name
}

# Postgres database for the consumer
module "provider-postgres" {
depends_on = [kubernetes_config_map.postgres-initdb-config-cs]
depends_on = [kubernetes_config_map.postgres-initdb-config-cs]
source = "./modules/postgres"
instance-name = "provider"
init-sql-configs = [
Expand Down

0 comments on commit 73a43b0

Please sign in to comment.