From 67be16f94e48a7376418124571fec86b759ccc2e Mon Sep 17 00:00:00 2001
From: Miren Esnaola <mirene@google.com>
Date: Tue, 22 Nov 2022 12:27:36 +0100
Subject: [PATCH] ADFS blueprint fixes

---
 blueprints/cloud-operations/adfs/ansible/playbook.yaml      | 2 +-
 blueprints/cloud-operations/adfs/main.tf                    | 5 +++--
 tests/blueprints/cloud_operations/adfs/fixture/variables.tf | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/blueprints/cloud-operations/adfs/ansible/playbook.yaml b/blueprints/cloud-operations/adfs/ansible/playbook.yaml
index 96d2e3baa4..9b2db5ab39 100644
--- a/blueprints/cloud-operations/adfs/ansible/playbook.yaml
+++ b/blueprints/cloud-operations/adfs/ansible/playbook.yaml
@@ -14,7 +14,7 @@
 
 - name: Prepare
   hosts: adfs
-  gather_facts: yes
+  gather_facts: no
   vars_files:
     - vars/vars.yaml
   roles:
diff --git a/blueprints/cloud-operations/adfs/main.tf b/blueprints/cloud-operations/adfs/main.tf
index beb06fbdd5..4d52bd77ee 100644
--- a/blueprints/cloud-operations/adfs/main.tf
+++ b/blueprints/cloud-operations/adfs/main.tf
@@ -28,8 +28,9 @@ module "project" {
     ? var.project_create.parent
     : null
   )
-  prefix = var.project_create == null ? null : var.prefix
-  name   = var.project_id
+  project_create = var.project_create != null
+  prefix         = var.project_create == null ? null : var.prefix
+  name           = var.project_id
   services = [
     "compute.googleapis.com",
     "dns.googleapis.com",
diff --git a/tests/blueprints/cloud_operations/adfs/fixture/variables.tf b/tests/blueprints/cloud_operations/adfs/fixture/variables.tf
index a48a77e21e..35968552f7 100644
--- a/tests/blueprints/cloud_operations/adfs/fixture/variables.tf
+++ b/tests/blueprints/cloud_operations/adfs/fixture/variables.tf
@@ -31,7 +31,10 @@ variable "project_create" {
     billing_account_id = string
     parent             = string
   })
-  default = null
+  default = {
+    billing_account_id = "12345-12345-12345"
+    parent             = "folders/123456789"
+  }
 }
 
 variable "project_id" {