feat: 1.4.0

Author: radomarina

modules/single_integration/data.tf

@@ -1,11 +1,5 @@
 data "azuread_client_config" "current" {}
 
-data "azuread_application_published_app_ids" "well_known" {}
-
-resource "azuread_service_principal" "msgraph" {
-  client_id    = data.azuread_application_published_app_ids.well_known.result.MicrosoftGraph
-  use_existing = true
-}
 
 data "azuread_service_principal" "existing" {
   count = var.existing_service_principal_id != "" ? 1 : 0

modules/single_integration/integration.tf

@@ -19,7 +19,7 @@ module "firefly_integrate" {
   source                      = "./modules/firefly_azure_integration"
   firefly_token               = local.token
   subscription_id             = var.subscription_id
-  subscription_name           = var.subscription_name
+  subscription_name           = var.subscription_id
   tenant_id                   = var.tenant_id
   application_id              = local.service_principle_client_id
   client_secret               = azuread_service_principal_password.current.value

modules/single_integration/modules/firefly_azure_integration/main.tf

@@ -12,7 +12,7 @@ data "http" "firefly_azure_integration_request" {
   }
   request_body = jsonencode(
     {
-      "name"                       = var.subscription_name,
+      "name"                       = var.subscription_id,
       "subscriptionId"             = var.subscription_id,
       "tenantId"                   = var.tenant_id,
       "applicationId"              = var.application_id,

modules/single_integration/modules/firefly_azure_integration/vars.tf

@@ -1,6 +1,7 @@
 variable "subscription_name" {
   type        = string
   description = "subscription_name"
+  default = ""
 }
 
 variable "firefly_token" {

modules/single_integration/vars.tf

@@ -96,6 +96,7 @@ variable "subscription_id" {
 
 variable "subscription_name" {
   type = string
+  default = ""
 }
 
 variable "is_prod" {