fixed conflicts

Author: root

.gitignore

@@ -1,5 +1,10 @@
-#  Local .terraform directories
+#  Local hidden directories
 **/.terraform/*
+**/.backup/*
 
-# .tfstate files
-**/*.tf*
+# Local .tfstate files
+*.tfstate
+*.tfstate.*
+
+# Zipped google function
+google_function/demo.*

README.md

@@ -217,8 +217,8 @@ terrahub graph
 Your output should be similar to the one below:
 ```
 Project: demo-terraform-automation-google
- └─ google_storage_7b3c5d2c [path: ./google_storage_7b3c5d2c]
-    └─ google_function_7b3c5d2c [path: ./google_function_7b3c5d2c]
+ └─ google_storage [path: ./google_storage]
+    └─ google_function [path: ./google_function]
 ```
 
 

google_function/.terrahub.yml

@@ -3,7 +3,7 @@ component:
   mapping:
     - .
   dependsOn:
-    - ../demo_storage_bucket
+    - ../google_storage
   template:
     terraform:
       backend:
@@ -23,9 +23,15 @@ component:
           source: ./demo.zip
       google_cloudfunctions_function:
         google_function:
+<<<<<<< HEAD:google_function/.terrahub.yml
           depends_on:
             - google_storage_bucket_object.google_storage_object
           name: 'demofunction${local.project["code"]}'
+=======
+          name: 'demofunction${local.project["code"]}'
+          depends_on:
+            - google_storage_bucket_object.google_storage_object
+>>>>>>> 954e40474032055d4b4f929cfdbe7991e50c8e39:google_function/.terrahub.yml
           region: us-central1
           runtime: nodejs8
           description: My demo function
@@ -35,6 +41,24 @@ component:
           trigger_http: true
           timeout: 60
           entry_point: helloGET
+<<<<<<< HEAD:google_function/.terrahub.yml
+=======
+      google_storage_bucket_object:
+        google_storage_object:
+          name: demo.zip
+          bucket: '${data.terraform_remote_state.storage.thub_id}'
+          source: ./demo.zip
+    terraform:
+      backend:
+        local:
+          path: /tmp/.terrahub/local_backend/google_function/terraform.tfstate
+    data:
+      terraform_remote_state:
+        storage:
+          backend: local
+          config:
+            path: /tmp/.terrahub/local_backend/google_storage/terraform.tfstate
+>>>>>>> 954e40474032055d4b4f929cfdbe7991e50c8e39:google_function/.terrahub.yml
     output:
       id:
         value: '${google_cloudfunctions_function.google_function.id}'
@@ -64,7 +88,20 @@ build:
     build:
       commands:
         - 'echo "BUILD: Running build step"'
+<<<<<<< HEAD:google_function/.terrahub.yml
         - ./scripts/build.sh $COMPONENT_NAME $OBJECT_NAME $THUB_BUCKET_KEY/
+=======
+        - >-
+          if [ "$(head -n 1 "$THUB_FUNCTION_TXT")" != "$(stat -c %y
+          "${THUB_BUILD_PATH}/index.js")" ]; then zip -j ${THUB_FUNCTION_ZIP}
+          ${THUB_BUILD_PATH}/index.js; fi
+        - >-
+          if [ "$(head -n 1 "$THUB_FUNCTION_TXT")" != "$(stat -c %y
+          "${THUB_BUILD_PATH}/index.js")" ]; then terrahub configure -i
+          google_function -c
+          component.template.resource.google_storage_bucket_object.google_storage_object.name=$(date
+          +%s).zip; fi
+>>>>>>> 954e40474032055d4b4f929cfdbe7991e50c8e39:google_function/.terrahub.yml
       finally:
         - 'echo "BUILD: build step successful"'
     post_build: