Support custom schema in Healthcare HL7 V2 stores #3261

umairidris · 2020-03-17T18:00:38Z

Replace hashicorp/terraform-provider-google-beta#1858

NOTE: This field is still in alpha and will be launched in the coming weeks, the goal of this PR is to get any reviews out of the way so this can be merged in without additional delays.

Release Note Template for Downstream PRs (will be copied)

healthcare: added `schema` field to `google_healthcare_hl7_v2_store`

modular-magician · 2020-03-17T20:48:41Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 2 files changed, 69 insertions(+), 13 deletions(-))

modular-magician · 2020-03-17T22:06:09Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 2 files changed, 74 insertions(+), 13 deletions(-))

modular-magician · 2020-03-17T22:39:04Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 2 files changed, 74 insertions(+), 13 deletions(-))

modular-magician · 2020-03-17T23:38:19Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 2 files changed, 433 insertions(+), 333 deletions(-))

modular-magician · 2020-03-17T23:44:47Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 2 files changed, 78 insertions(+), 13 deletions(-))

umairidris · 2020-03-18T01:27:42Z

@danawillow how does this look?

I took all your suggestions except handling the error for json.Marshal call in flatten in other places. Given gcp rest APIs always return valid JSON anyway I think we could assume for the time being that the API will return a valid JSON value which is marshallable, until the templates are updated to return error in flatten. Is that acceptable?

Also, for some reason skip_tests were set on all the examples, I am not sure why but I imagine having tests for this would be nice.

NOTE: the current schema in the example is empty, I am working on a minimal schema to add here. Will update back when I get it.

modular-magician · 2020-03-18T01:27:50Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 2 files changed, 78 insertions(+), 13 deletions(-))

modular-magician · 2020-03-18T01:35:35Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 2 files changed, 78 insertions(+), 13 deletions(-))

danawillow

This all looks reasonable to me!

templates/terraform/custom_expand/healthcare_hl7_v2_store_schema.erb

templates/terraform/custom_flatten/healthcare_hl7_v2_store_schema.erb

templates/terraform/examples/healthcare_hl7_v2_store_parser_config.tf.erb

templates/terraform/custom_flatten/healthcare_hl7_v2_store_schema.erb

products/healthcare/terraform.yaml

…ma.erb Co-Authored-By: Dana Hoffman <danahoffman@google.com>

Co-Authored-By: Dana Hoffman <danahoffman@google.com>

modular-magician · 2020-03-18T19:15:48Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 2 files changed, 78 insertions(+), 13 deletions(-))

modular-magician · 2020-03-18T19:16:09Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 2 files changed, 78 insertions(+), 13 deletions(-))

modular-magician · 2020-03-18T19:16:34Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 2 files changed, 78 insertions(+), 13 deletions(-))

modular-magician · 2020-03-18T19:27:08Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 3 files changed, 176 insertions(+), 13 deletions(-))
TF OiCS: Diff ( 4 files changed, 120 insertions(+))

modular-magician · 2020-03-20T19:06:00Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 3 files changed, 326 insertions(+), 13 deletions(-))
TF OiCS: Diff ( 4 files changed, 195 insertions(+))

umairidris · 2020-03-20T19:28:32Z

Done. PTAL (note tests won't pass as this field is still not in beta. ETA ~3 weeks).

danawillow · 2020-03-20T22:44:43Z

Seems fine. I'm going to hold off on marking it as approved until we can actually run tests. In the meantime, it would be worth confirming that the provider builds locally with these changes, since our cloud build run failed.

…-modules into schema

modular-magician · 2020-04-14T22:18:51Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 3 files changed, 326 insertions(+), 13 deletions(-))
TF OiCS: Diff ( 4 files changed, 195 insertions(+))

umairidris · 2020-04-14T22:21:05Z

@danawillow the feature has been added in beta and I verified it builds locally. Can you check what error is reported by Cloud Build?

danawillow · 2020-04-14T22:36:12Z

google-beta/resource_healthcare_hl7_v2_store_test.go:163:6: testAccCheckHealthcareHl7V2StoreDestroy redeclared in this block
	previous declaration at google-beta/resource_healthcare_hl7_v2_store_generated_test.go:145:66
?   	github.com/terraform-providers/terraform-provider-google-beta	[no test files]
FAIL	github.com/terraform-providers/terraform-provider-google-beta/google-beta [build failed]
?   	github.com/terraform-providers/terraform-provider-google-beta/scripts/affectedtests	[no test files]
?   	github.com/terraform-providers/terraform-provider-google-beta/version	[no test files]
FAIL

modular-magician · 2020-04-15T00:40:31Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 4 files changed, 378 insertions(+), 39 deletions(-))
TF OiCS: Diff ( 8 files changed, 319 insertions(+))

umairidris · 2020-04-15T00:55:50Z

@danawillow success! Bonus I stopped skipping the basic test too.

danawillow · 2020-04-15T19:52:38Z

I'm seeing two test failures:

TestAccHealthcareHl7V2Store_healthcareHl7V2StoreBasicExample
  === RUN   TestAccHealthcareHl7V2Store_healthcareHl7V2StoreBasicExample
=== PAUSE TestAccHealthcareHl7V2Store_healthcareHl7V2StoreBasicExample
=== CONT  TestAccHealthcareHl7V2Store_healthcareHl7V2StoreBasicExample
--- FAIL: TestAccHealthcareHl7V2Store_healthcareHl7V2StoreBasicExample (0.00s)
    testing.go:635: Step 0 error: Error initializing context: 2 problems:
        
        - Could not satisfy plugin requirements: 
        Plugin reinitialization required. Please run "terraform init".
        
        Plugins are external binaries that Terraform uses to access and manipulate
        resources. The configuration provided requires plugins which can't be located,
        don't satisfy the version constraints, or are otherwise incompatible.
        
        Terraform automatically discovers provider requirements from your
        configuration, including providers used in child modules. To see the
        requirements and constraints from each module, run "terraform providers".
        
        - provider "google" is not available
FAIL

TestAccHealthcareHl7V2Store_basic
  === RUN   TestAccHealthcareHl7V2Store_basic
=== PAUSE TestAccHealthcareHl7V2Store_basic
=== CONT  TestAccHealthcareHl7V2Store_basic
--- FAIL: TestAccHealthcareHl7V2Store_basic (9.31s)
    testing.go:635: Step 2 error: After applying this step, the plan was not empty:
        
        DIFF:
        
        UPDATE: google_healthcare_hl7_v2_store.default
          dataset:                            "projects/ci-test-project-188019/locations/us-central1/datasets/tf-test-dataset-ji8hn0zkgl" => "projects/ci-test-project-188019/locations/us-central1/datasets/tf-test-dataset-ji8hn0zkgl"
          id:                                 "projects/ci-test-project-188019/locations/us-central1/datasets/tf-test-dataset-ji8hn0zkgl/hl7V2Stores/tf-test-hl7_v2-store-8fsylqbkk1" => "projects/ci-test-project-188019/locations/us-central1/datasets/tf-test-dataset-ji8hn0zkgl/hl7V2Stores/tf-test-hl7_v2-store-8fsylqbkk1"
          labels.label1:                      "labelvalue1" => "labelvalue1"
          name:                               "tf-test-hl7_v2-store-8fsylqbkk1" => "tf-test-hl7_v2-store-8fsylqbkk1"
          notification_config.#:              "1" => "1"
          notification_config.0.pubsub_topic: "projects/ci-test-project-188019/topics/tf-test-topic-n4f1n98773" => "projects/ci-test-project-188019/topics/tf-test-topic-n4f1n98773"
          parser_config.#:                    "1" => "1"
          parser_config.0.allow_null_header:  "true" => "true"
          parser_config.0.schema:             "null" => ""
          parser_config.0.segment_terminator: "Jw==" => "Jw=="
          self_link:                          "projects/ci-test-project-188019/locations/us-central1/datasets/tf-test-dataset-ji8hn0zkgl/hl7V2Stores/tf-test-hl7_v2-store-8fsylqbkk1" => "projects/ci-test-project-188019/locations/us-central1/datasets/tf-test-dataset-ji8hn0zkgl/hl7V2Stores/tf-test-hl7_v2-store-8fsylqbkk1"
        
        
        
        STATE:
        
        google_healthcare_dataset.dataset:
          ID = projects/ci-test-project-188019/locations/us-central1/datasets/tf-test-dataset-ji8hn0zkgl
          provider = provider.google
          location = us-central1
          name = tf-test-dataset-ji8hn0zkgl
          project = ci-test-project-188019
          self_link = projects/ci-test-project-188019/locations/us-central1/datasets/tf-test-dataset-ji8hn0zkgl
          time_zone = UTC
        google_healthcare_hl7_v2_store.default:
          ID = projects/ci-test-project-188019/locations/us-central1/datasets/tf-test-dataset-ji8hn0zkgl/hl7V2Stores/tf-test-hl7_v2-store-8fsylqbkk1
          provider = provider.google
          dataset = projects/ci-test-project-188019/locations/us-central1/datasets/tf-test-dataset-ji8hn0zkgl
          labels.label1 = labelvalue1
          name = tf-test-hl7_v2-store-8fsylqbkk1
          notification_config.# = 1
          notification_config.0.pubsub_topic = projects/ci-test-project-188019/topics/tf-test-topic-n4f1n98773
          parser_config.# = 1
          parser_config.0.allow_null_header = true
          parser_config.0.schema = null
          parser_config.0.segment_terminator = Jw==
          self_link = projects/ci-test-project-188019/locations/us-central1/datasets/tf-test-dataset-ji8hn0zkgl/hl7V2Stores/tf-test-hl7_v2-store-8fsylqbkk1
        
          Dependencies:
            google_healthcare_dataset.dataset
            google_pubsub_topic.topic
        google_pubsub_topic.topic:
          ID = projects/ci-test-project-188019/topics/tf-test-topic-n4f1n98773
          provider = provider.google
          kms_key_name = 
          name = tf-test-topic-n4f1n98773
          project = ci-test-project-188019
FAIL

modular-magician · 2020-04-16T20:25:50Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 4 files changed, 379 insertions(+), 41 deletions(-))
TF OiCS: Diff ( 8 files changed, 319 insertions(+))

umairidris · 2020-04-16T20:29:41Z

Thanks Dana. Maybe because I was out of sync with master? I have synced now and it's showing 3 successful checks, so I am hoping it's OK now.

danawillow · 2020-04-16T23:10:55Z

The status checks are for basic things like whether the generated code compiles. We don't run acceptance tests automatically because they create real GCP resources. https://github.com/GoogleCloudPlatform/magic-modules#testing-your-changes talks a bit about generating the code and running tests on it yourself, but let me know if you have questions or want to walk through running and debugging them and I can help. I'll let you see if you can figure it out first though :)

modular-magician · 2020-04-17T01:37:01Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 4 files changed, 377 insertions(+), 35 deletions(-))
TF OiCS: Diff ( 8 files changed, 321 insertions(+))

umairidris · 2020-04-17T03:33:12Z

Fixed.

$ GOOGLE_PROJECT=umairidris-data-2020-03-30 GOOGLE_REGION=us-central1 GOOGLE_ZONE=us-central1-a GOOGLE_USE_DEFAULT_CREDENTIALS=true make testacc TEST=./google-beta TESTARGS='-run=TestAccHealthcareHl7V2Store_healthcareHl7V2StoreBasicExample'
==> Checking source code against gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 TF_SCHEMA_PANIC_ON_ERROR=1 go test ./google-beta -v -run=TestAccHealthcareHl7V2Store_healthcareHl7V2StoreBasicExample -timeout 240m -ldflags="-X=github.com/terraform-providers/terraform-provider-google-beta/version.ProviderVersion=acc"
=== RUN   TestAccHealthcareHl7V2Store_healthcareHl7V2StoreBasicExample
=== PAUSE TestAccHealthcareHl7V2Store_healthcareHl7V2StoreBasicExample
=== CONT  TestAccHealthcareHl7V2Store_healthcareHl7V2StoreBasicExample
--- PASS: TestAccHealthcareHl7V2Store_healthcareHl7V2StoreBasicExample (6.13s)
PASS
ok  	github.com/terraform-providers/terraform-provider-google-beta/google-beta	6.420s

$ GOOGLE_PROJECT=umairidris-data-2020-03-30 GOOGLE_REGION=us-central1 GOOGLE_ZONE=us-central1-a GOOGLE_USE_DEFAULT_CREDENTIALS=true make testacc TEST=./google-beta TESTARGS='-run=TestAccHealthcareHl7V2Store_basic'
==> Checking source code against gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 TF_SCHEMA_PANIC_ON_ERROR=1 go test ./google-beta -v -run=TestAccHealthcareHl7V2Store_basic -timeout 240m -ldflags="-X=github.com/terraform-providers/terraform-provider-google-beta/version.ProviderVersion=acc"
=== RUN   TestAccHealthcareHl7V2Store_basic
=== PAUSE TestAccHealthcareHl7V2Store_basic
=== CONT  TestAccHealthcareHl7V2Store_basic
--- PASS: TestAccHealthcareHl7V2Store_basic (11.45s)
PASS
ok  	github.com/terraform-providers/terraform-provider-google-beta/google-beta	11.742s

modular-magician · 2020-04-17T03:37:43Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 4 files changed, 380 insertions(+), 35 deletions(-))
TF OiCS: Diff ( 8 files changed, 321 insertions(+))

templates/terraform/examples/healthcare_hl7_v2_store_parser_config.tf.erb

modular-magician · 2020-04-17T22:17:45Z

Hi! I'm the modular magician. Your PR generated some diffs in downstreams - here they are.

Diff report:

Terraform Beta: Diff ( 4 files changed, 384 insertions(+), 35 deletions(-))
TF OiCS: Diff ( 8 files changed, 323 insertions(+))

danawillow

Looks good!

…m#3261) * add schema field and custom expander * rename * fix custom expand file ref * add custom flatten * actually add the files * rm extra file * add state and validate funcs * single line * shorter var * don't return error on flatten * Update templates/terraform/custom_expand/healthcare_hl7_v2_store_schema.erb Co-Authored-By: Dana Hoffman <danahoffman@google.com> * Apply suggestions from code review Co-Authored-By: Dana Hoffman <danahoffman@google.com> * enable test for parser config * add schema eample * rm dup func, enable basic hl7 test * min version beta * fix examples * fix flatten * heredoc Co-authored-by: Dana Hoffman <danahoffman@google.com>

add schema field and custom expander

ce6b7cf

googlebot added the cla: yes label Mar 17, 2020

umairidris added 2 commits March 17, 2020 14:34

rename

58a8078

fix custom expand file ref

cbc257a

umairidris added 2 commits March 17, 2020 17:54

add custom flatten

6031535

actually add the files

eee92e9

rm extra file

3811b38

add state and validate funcs

ce00fd5

single line

8bf2b80

shorter var

cd63ea5

don't return error on flatten

c80d72f

umairidris changed the title ~~[WIP] Support custom schema in Healthcare HL7 V2 stores~~ Support custom schema in Healthcare HL7 V2 stores Mar 18, 2020

danawillow reviewed Mar 18, 2020

View reviewed changes

umairidris and others added 2 commits March 18, 2020 15:10

Update templates/terraform/custom_expand/healthcare_hl7_v2_store_sche…

d10f3ee

…ma.erb Co-Authored-By: Dana Hoffman <danahoffman@google.com>

Apply suggestions from code review

2610822

Co-Authored-By: Dana Hoffman <danahoffman@google.com>

enable test for parser config

c363275

add schema eample

2b24e56

umairidris requested a review from danawillow March 20, 2020 19:28

Merge branch 'master' of https://github.com/GoogleCloudPlatform/magic…

d59c149

…-modules into schema

umairidris added 2 commits April 14, 2020 20:26

rm dup func, enable basic hl7 test

2c7538a

min version beta

d1f7508

sync to head

4d574cd

fix examples

fc7a452

fix flatten

1a2551e

danawillow reviewed Apr 17, 2020

View reviewed changes

templates/terraform/examples/healthcare_hl7_v2_store_parser_config.tf.erb Outdated Show resolved Hide resolved

heredoc

39dcc2e

danawillow approved these changes Apr 17, 2020

View reviewed changes

danawillow merged commit fbe30e9 into GoogleCloudPlatform:master Apr 17, 2020

modular-magician mentioned this pull request Apr 17, 2020

Support custom schema in Healthcare HL7 V2 stores hashicorp/terraform-provider-google-beta#1962

Merged

umairidris deleted the schema branch April 17, 2020 23:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support custom schema in Healthcare HL7 V2 stores #3261

Support custom schema in Healthcare HL7 V2 stores #3261

umairidris commented Mar 17, 2020 •

edited

Loading

modular-magician commented Mar 17, 2020

modular-magician commented Mar 17, 2020

modular-magician commented Mar 17, 2020

modular-magician commented Mar 17, 2020

modular-magician commented Mar 17, 2020

umairidris commented Mar 18, 2020 •

edited

Loading

modular-magician commented Mar 18, 2020

modular-magician commented Mar 18, 2020

danawillow left a comment

modular-magician commented Mar 18, 2020

modular-magician commented Mar 18, 2020

modular-magician commented Mar 18, 2020

modular-magician commented Mar 18, 2020

modular-magician commented Mar 20, 2020

umairidris commented Mar 20, 2020

danawillow commented Mar 20, 2020

modular-magician commented Apr 14, 2020

umairidris commented Apr 14, 2020 •

edited

Loading

danawillow commented Apr 14, 2020

modular-magician commented Apr 15, 2020

umairidris commented Apr 15, 2020

danawillow commented Apr 15, 2020

modular-magician commented Apr 16, 2020

umairidris commented Apr 16, 2020

danawillow commented Apr 16, 2020

modular-magician commented Apr 17, 2020

umairidris commented Apr 17, 2020

modular-magician commented Apr 17, 2020

modular-magician commented Apr 17, 2020

danawillow left a comment

Support custom schema in Healthcare HL7 V2 stores #3261

Support custom schema in Healthcare HL7 V2 stores #3261

Conversation

umairidris commented Mar 17, 2020 • edited Loading

modular-magician commented Mar 17, 2020

Diff report:

modular-magician commented Mar 17, 2020

Diff report:

modular-magician commented Mar 17, 2020

Diff report:

modular-magician commented Mar 17, 2020

Diff report:

modular-magician commented Mar 17, 2020

Diff report:

umairidris commented Mar 18, 2020 • edited Loading

modular-magician commented Mar 18, 2020

Diff report:

modular-magician commented Mar 18, 2020

Diff report:

danawillow left a comment

Choose a reason for hiding this comment

modular-magician commented Mar 18, 2020

Diff report:

modular-magician commented Mar 18, 2020

Diff report:

modular-magician commented Mar 18, 2020

Diff report:

modular-magician commented Mar 18, 2020

Diff report:

modular-magician commented Mar 20, 2020

Diff report:

umairidris commented Mar 20, 2020

danawillow commented Mar 20, 2020

modular-magician commented Apr 14, 2020

Diff report:

umairidris commented Apr 14, 2020 • edited Loading

danawillow commented Apr 14, 2020

modular-magician commented Apr 15, 2020

Diff report:

umairidris commented Apr 15, 2020

danawillow commented Apr 15, 2020

modular-magician commented Apr 16, 2020

Diff report:

umairidris commented Apr 16, 2020

danawillow commented Apr 16, 2020

modular-magician commented Apr 17, 2020

Diff report:

umairidris commented Apr 17, 2020

modular-magician commented Apr 17, 2020

Diff report:

modular-magician commented Apr 17, 2020

Diff report:

danawillow left a comment

Choose a reason for hiding this comment

umairidris commented Mar 17, 2020 •

edited

Loading

umairidris commented Mar 18, 2020 •

edited

Loading

umairidris commented Apr 14, 2020 •

edited

Loading