Merge pull request #30 from hashicorp/initial-tests

Initial tests for project resource

README.md

@@ -39,14 +39,24 @@ terraform {
   required_providers {
     waypoint = {
       source  = "local/hashicorp/waypoint"
-      version = "0.1.0"
+      # version = ""
+      # latest version by default
+      # see the following resources for more information on specific versions:
+      # https://github.com/hashicorp/terraform-provider-waypoint/blob/main/CHANGELOG.md
+      # https://releases.hashicorp.com/
+      # https://github.com/hashicorp/terraform-provider-waypoint/releases
     }
   }
 }
 
 provider "waypoint" {
-  waypoint_addr = "localhost:9701"
-  token         = "..."
+  # if running locally: localhost:9701, 
+  # or use WAYPOINT_HOST environment variable 
+  # host = ""
+  
+  # output from `waypoint user token`, 
+  # or use WAYPOINT_TOKEN environment variable 
+  # token = ""
 }
 
 resource "waypoint_project" "example" {
@@ -76,6 +86,8 @@ resource "waypoint_project" "example" {
   }
 }
 ```
+NOTE: `WAYPOINT_HOST` and `WAYPOINT_TOKEN` may be set as environment variables, and will override the provider host/token set in your terraform configuration.
+
 
 ## Developing the Provider
 

docs/data-sources/runner_profile.md

@@ -13,20 +13,6 @@ description: |-
 ## Example Usage
 
 ```terraform
-terraform {
-  required_providers {
-    waypoint = {
-      source  = "hashicorp/waypoint"
-      version = "0.1.0"
-    }
-  }
-}
-
-provider "waypoint" {
-  host  = "localhost:9701"
-  token = ""
-}
-
 data "waypoint_runner_profile" "default_docker" {
   id = "01GV45AW59XGNT906S8XXKG5E5"
 }

docs/index.md

@@ -16,15 +16,25 @@ description: |-
 terraform {
   required_providers {
     waypoint = {
-      source  = "hashicorp/waypoint"
-      version = "0.1.0"
+      source = "hashicorp/waypoint"
+      # version = ""
+      # latest version by default
+      # see the following resources for more information on specific versions:
+      # https://github.com/hashicorp/terraform-provider-waypoint/blob/main/CHANGELOG.md
+      # https://releases.hashicorp.com/
+      # https://github.com/hashicorp/terraform-provider-waypoint/releases
     }
   }
 }
 
 provider "waypoint" {
-  waypoint_addr = "localhost:9701"
-  token         = "..."
+  # if running locally: localhost:9701, 
+  # or use WAYPOINT_HOST environment variable 
+  # host = ""
+
+  # output from `waypoint user token`, 
+  # or use WAYPOINT_TOKEN environment variable 
+  # token = ""
 }
 ```
 

docs/resources/config_source.md

@@ -13,6 +13,7 @@ description: |-
 ## Example Usage
 
 ```terraform
+## Example #1: global scoped
 resource "waypoint_config_source" "globalvault" {
   type  = "globalvault"
   scope = "global"
@@ -23,6 +24,7 @@ resource "waypoint_config_source" "globalvault" {
   }
 }
 
+## Example #2: project scoped
 resource "waypoint_config_source" "projectvault" {
   type        = "vault"
   scope       = "project"

docs/resources/project.md

@@ -14,34 +14,51 @@ description: |-
 
 ```terraform
 resource "waypoint_project" "example" {
-
   project_name           = "example"
-  remote_runners_enabled = false
+  remote_runners_enabled = true
 
-  data_source_git {
+  data_source_git = {
     git_url                   = "https://github.com/hashicorp/waypoint-examples"
     git_path                  = "docker/go"
     git_ref                   = "HEAD"
     file_change_signal        = "some-signal"
     git_poll_interval_seconds = 15
+    # ignore_changes_outside_path = true
   }
 
   app_status_poll_seconds = 12
 
-  project_variables = {
-    name       = "devopsrob"
-    job        = "dev-advocate"
-    conference = "HashiConf EU 2022"
+  project_variables = [
+    {
+      name      = "name"
+      value     = "devopsrob"
+      sensitive = true
+    },
+    {
+      name      = "job"
+      value     = "dev-advocate"
+      sensitive = false
+    },
+    {
+      name      = "conference"
+      value     = "HashiConf EU 2022"
+      sensitive = false
+    },
+  ]
+
+  git_auth_basic = {
+    username = "catsby"
+    password = "test"
   }
 }
 
 ##Git auth ssh example
-resource "waypoint_project" "example" {
+resource "waypoint_project" "example1" {
 
-  project_name           = "example"
+  project_name           = "example1"
   remote_runners_enabled = true
 
-  data_source_git {
+  data_source_git = {
     git_url                   = "https://github.com/hashicorp/waypoint-examples"
     git_path                  = "docker/go"
     git_ref                   = "HEAD"
@@ -51,16 +68,17 @@ resource "waypoint_project" "example" {
 
   app_status_poll_seconds = 12
 
-  project_variables = {
-    name       = "devopsrob"
-    job        = "dev-advocate"
-    conference = "HashiConf EU 2022"
-  }
-
-
-  git_auth_ssh {
-    git_user        = "devops-rob"
-    passphrase      = "test-password"
+  project_variables = [
+    {
+      name      = "devopsrob"
+      value     = "dev-advocate"
+      sensitive = "false"
+    },
+  ]
+
+  git_auth_ssh = {
+    git_user        = "cassie"
+    passphrase      = "test"
     ssh_private_key = <<EOF
 -----BEGIN RSA PRIVATE KEY-----
 MIICXAIBAAKBgQCjcGqTkOq0CR3rTx0ZSQSIdTrDrFAYl29611xN8aVgMQIWtDB/
@@ -98,6 +116,10 @@ EOF
 - `project_variables` (Attributes List) List of variables in Key/value pairs associated with the Waypoint Project (see [below for nested schema](#nestedatt--project_variables))
 - `remote_runners_enabled` (Boolean) Enable remote runners for project
 
+### Read-Only
+
+- `id` (String) The id required for acceptance testing to work
+
 <a id="nestedatt--data_source_git"></a>
 ### Nested Schema for `data_source_git`
 

examples/data-sources/waypoint_runner_profile/data-source.tf

@@ -1,17 +1,3 @@
-terraform {
-  required_providers {
-    waypoint = {
-      source  = "hashicorp/waypoint"
-      version = "0.1.0"
-    }
-  }
-}
-
-provider "waypoint" {
-  host  = "localhost:9701"
-  token = ""
-}
-
 data "waypoint_runner_profile" "default_docker" {
   id = "01GV45AW59XGNT906S8XXKG5E5"
 }

examples/provider/provider.tf

@@ -1,14 +1,23 @@
 terraform {
   required_providers {
     waypoint = {
-      source  = "hashicorp/waypoint"
-      version = "0.1.0"
+      source = "hashicorp/waypoint"
+      # version = ""
+      # latest version by default
+      # see the following resources for more information on specific versions:
+      # https://github.com/hashicorp/terraform-provider-waypoint/blob/main/CHANGELOG.md
+      # https://releases.hashicorp.com/
+      # https://github.com/hashicorp/terraform-provider-waypoint/releases
     }
   }
 }
 
 provider "waypoint" {
-  waypoint_addr = "localhost:9701"
-  token         = "..."
-}
+  # if running locally: localhost:9701, 
+  # or use WAYPOINT_HOST environment variable 
+  # host = ""
 
+  # output from `waypoint user token`, 
+  # or use WAYPOINT_TOKEN environment variable 
+  # token = ""
+}

examples/resources/waypoint_config_source/resource.tf

@@ -1,3 +1,4 @@
+## Example #1: global scoped
 resource "waypoint_config_source" "globalvault" {
   type  = "globalvault"
   scope = "global"
@@ -8,6 +9,7 @@ resource "waypoint_config_source" "globalvault" {
   }
 }
 
+## Example #2: project scoped
 resource "waypoint_config_source" "projectvault" {
   type        = "vault"
   scope       = "project"