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

Removing docker registry username and pass from API config #609

Merged
merged 1 commit into from
Aug 12, 2021
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
2 changes: 0 additions & 2 deletions templates/core/terraform/api-webapp/api-webapp.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ resource "azurerm_app_service" "management_api" {
"XDT_MicrosoftApplicationInsights_Mode" = "default"
"WEBSITES_PORT" = "8000"
"WEBSITE_VNET_ROUTE_ALL" = 1
"DOCKER_REGISTRY_SERVER_USERNAME" = var.docker_registry_username
"DOCKER_REGISTRY_SERVER_URL" = "https://${var.docker_registry_server}"
"DOCKER_REGISTRY_SERVER_PASSWORD" = var.docker_registry_password
"STATE_STORE_ENDPOINT" = var.state_store_endpoint
"COSMOSDB_ACCOUNT_NAME" = var.cosmosdb_account_name
"SERVICE_BUS_FULLY_QUALIFIED_NAMESPACE" = "sb-${var.tre_id}.servicebus.windows.net"
Expand Down
2 changes: 0 additions & 2 deletions templates/core/terraform/api-webapp/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ variable "log_analytics_workspace_id" {}
variable "management_api_image_repository" {}
variable "management_api_image_tag" {}
variable "docker_registry_server" {}
variable "docker_registry_username" {}
variable "docker_registry_password" {}
variable "state_store_endpoint" {}
variable "cosmosdb_account_name" {}
variable "service_bus_resource_request_queue" {}
Expand Down
2 changes: 0 additions & 2 deletions templates/core/terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ module "api-webapp" {
management_api_image_repository = var.management_api_image_repository
management_api_image_tag = var.management_api_image_tag
docker_registry_server = var.docker_registry_server
docker_registry_username = var.docker_registry_username
docker_registry_password = var.docker_registry_password
state_store_endpoint = module.state-store.endpoint
cosmosdb_account_name = module.state-store.cosmosdb_account_name
service_bus_resource_request_queue = module.servicebus.workspacequeue
Expand Down
11 changes: 0 additions & 11 deletions templates/core/terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,6 @@ variable "docker_registry_server" {
description = "Docker registry server"
}

variable "docker_registry_username" {
type = string
description = "Docker registry username"
}

variable "docker_registry_password" {
type = string
description = "Docker registry password"
sensitive = true
}

variable "swagger_ui_client_id" {
type = string
description = "The client id (app id) of the registration in Azure AD for the Swagger UI"
Expand Down