Skip to content

Commit

Permalink
Resource schema references semantic, from "references" to singular "r…
Browse files Browse the repository at this point in the history 
…eference" property
  • Loading branch information
@noureddineseddik @arkiaconsulting
noureddineseddik authored and arkiaconsulting committed Jul 28, 2021
1 parent 863d768 commit dff69f0
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ resource "schemaregistry_schema" "with_reference" {
subject = "with_reference_subject"
schema = "[\"akc.test.event\", \"akc.test.other_event\"]"
references {
reference {
name = "akc.test.event"
subject = schemaregistry_schema.referenced_event.subject
// version will always be upgraded with the referenced event schema version
version = schemaregistry_schema.referenced_event.version
}
references {
reference {
name = "akc.test.other_event"
subject = schemaregistry_schema.user_added.subject
// version will always be upgraded with the referenced event schema version
Expand Down
2 changes: 1 addition & 1 deletion examples/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ resource "schemaregistry_schema" "with_reference" {
subject = "with-reference"
schema = "[\"akc.test.userAdded\"]"

references {
reference {
name = "akc.test.userAdded"
subject = schemaregistry_schema.user_added.subject
version = schemaregistry_schema.user_added.version
Expand Down
2 changes: 1 addition & 1 deletion schemaregistry/fixtures.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func fixtureResourceSchemaWithReferenceBuild(s schemaWithReferenceFixture) strin
schema = "{{.WithReferences.Schema}}"
{{range .References}}
references {
reference {
name = "{{.Name}}"
subject = {{.Subject}}
version = {{.Version}}
Expand Down
12 changes: 6 additions & 6 deletions schemaregistry/resource_schema.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func resourceSchema() *schema.Resource {
Computed: true,
Description: "The schema string",
},
"references": {
"reference": {
Type: schema.TypeList,
Optional: true,
Description: "The referenced schema list",
Expand Down Expand Up @@ -90,7 +90,7 @@ func schemaCreate(ctx context.Context, d *schema.ResourceData, meta interface{})

subject := d.Get("subject").(string)
schemaString := d.Get("schema").(string)
references := ToRegistryReferences(d.Get("references").([]interface{}))
references := ToRegistryReferences(d.Get("reference").([]interface{}))

client := meta.(*srclient.SchemaRegistryClient)

Expand All @@ -104,7 +104,7 @@ func schemaCreate(ctx context.Context, d *schema.ResourceData, meta interface{})
d.Set("schema", schema.Schema())
d.Set("version", schema.Version())

if err = d.Set("references", FromRegistryReferences(schema.References())); err != nil {
if err = d.Set("reference", FromRegistryReferences(schema.References())); err != nil {
return diag.FromErr(err)
}

Expand All @@ -116,7 +116,7 @@ func schemaUpdate(ctx context.Context, d *schema.ResourceData, meta interface{})

subject := d.Get("subject").(string)
schemaString := d.Get("schema").(string)
references := ToRegistryReferences(d.Get("references").([]interface{}))
references := ToRegistryReferences(d.Get("reference").([]interface{}))

client := meta.(*srclient.SchemaRegistryClient)

Expand All @@ -132,7 +132,7 @@ func schemaUpdate(ctx context.Context, d *schema.ResourceData, meta interface{})
d.Set("schema", schema.Schema())
d.Set("version", schema.Version())

if err = d.Set("references", FromRegistryReferences(schema.References())); err != nil {
if err = d.Set("reference", FromRegistryReferences(schema.References())); err != nil {
return diag.FromErr(err)
}

Expand All @@ -155,7 +155,7 @@ func schemaRead(ctx context.Context, d *schema.ResourceData, meta interface{}) d
d.Set("subject", subject)
d.Set("version", schema.Version())

if err = d.Set("references", FromRegistryReferences(schema.References())); err != nil {
if err = d.Set("reference", FromRegistryReferences(schema.References())); err != nil {
return diag.FromErr(err)
}

Expand Down
34 changes: 17 additions & 17 deletions schemaregistry/resource_schema_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,10 @@ func TestAccResourceSchemaReferences_basic(t *testing.T) {
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "version", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "schema", strings.Replace(`[\"akc.test.userAdded\"]`, "\\", "", -1)),

resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.#", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.0.name", "akc.test.userAdded"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.0.subject", fmt.Sprintf("referencedSub-%s", u)),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.0.version", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.#", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.0.name", "akc.test.userAdded"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.0.subject", fmt.Sprintf("referencedSub-%s", u)),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.0.version", "1"),
},
},
{
Expand Down Expand Up @@ -226,15 +226,15 @@ func TestAccResourceSchemaReferences_basic(t *testing.T) {
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "version", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "schema", strings.Replace(`[\"akc.test.userAdded\"]`, "\\", "", -1)),

resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.#", "2"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.#", "2"),

resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.0.name", "akc.test.userAdded"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.0.subject", fmt.Sprintf("referencedSub-%s", u)),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.0.version", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.0.name", "akc.test.userAdded"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.0.subject", fmt.Sprintf("referencedSub-%s", u)),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.0.version", "1"),

resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.1.name", "foo.bar.other"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.1.subject", fmt.Sprintf("otherReferencedSub-%s", u)),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.1.version", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.1.name", "foo.bar.other"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.1.subject", fmt.Sprintf("otherReferencedSub-%s", u)),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.1.version", "1"),
},
},
}
Expand Down Expand Up @@ -341,8 +341,8 @@ func TestAccResourceSchemaReferences_updateCompatible(t *testing.T) {
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "id", schemaWithReferenceSubject),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "version", "1"),

resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.#", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.0.version", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.#", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.0.version", "1"),
),
},
{
Expand Down Expand Up @@ -374,8 +374,8 @@ func TestAccResourceSchemaReferences_updateCompatible(t *testing.T) {
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "id", schemaWithReferenceSubject),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "version", "2"),

resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.#", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.0.version", "2"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.#", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.0.version", "2"),
),
},
},
Expand Down Expand Up @@ -424,8 +424,8 @@ func TestAccResourceSchemaReferences_updateIncompatible(t *testing.T) {
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "id", schemaWithReferenceSubject),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "version", "1"),

resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.#", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "references.0.version", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.#", "1"),
resource.TestCheckResourceAttr("schemaregistry_schema.schemaWithReference", "reference.0.version", "1"),
),
},
{
Expand Down

0 comments on commit dff69f0

Please sign in to comment.