Skip to content

refactor: remove Azure Blueprint support #168

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

Draft
jannymeshi wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor: remove Azure Blueprint support #168

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 1 addition & 21 deletions modules/azure/meshstack_integration.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,6 @@ variable "azure_subscription_owner_object_ids" {
description = "Optional explicit subscription owner object IDs. If null, current principal is used."
}

variable "azure_blueprint_service_principal_client_id" {
type = string
default = "f71766dc-90d9-4b7d-bd9d-4499c4331c3f"
description = "Client ID of the Azure Blueprints service principal."
}

variable "azure_blueprint_location" {
type = string
default = "westeurope"
description = "Azure region used for Blueprints."
}

variable "meshstack" {
type = object({
owning_workspace_identifier = string
Expand All @@ -51,11 +39,6 @@ data "azuread_domains" "aad_domains" {
only_initial = true
}

data "azuread_service_principal" "blueprints" {
# Client ID is known but object id changes
client_id = var.azure_blueprint_service_principal_client_id
}

data "azurerm_client_config" "current" {}

data "azurerm_role_definition" "contributor" {
Expand Down Expand Up @@ -146,9 +129,6 @@ resource "meshstack_platform" "azure" {

user_lookup_strategy = "UserByMailLookupStrategy"

blueprint_service_principal = data.azuread_service_principal.blueprints.object_id
blueprint_location = var.azure_blueprint_location

service_principal = {
client_id = module.azure_meshplatform.replicator_service_principal.Application_Client_ID
object_id = module.azure_meshplatform.replicator_service_principal.Enterprise_Application_Object_ID
Expand Down Expand Up @@ -263,7 +243,7 @@ terraform {
required_providers {
meshstack = {
source = "meshcloud/meshstack"
version = "~> 0.20.0"
version = "~> 0.20.6"
}
azurerm = {
source = "hashicorp/azurerm"
Expand Down
Loading