diff --git a/Makefile b/Makefile index 2d9f78e..ff04ead 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,15 @@ docker: docker build -t stobias123/terraform-provider-orion . && docker push stobias123/terraform-provider-orion local: - rm test/terraform-provider-orion || true - go build -o test/terraform-provider-orion . + rm example/terraform-provider-orion || true + go build -o example/terraform-provider-orion . tftest: - rm test/terraform.tfstate* || true - rm -rf test/.terraform || true + rm example/terraform.tfstate* || true + rm -rf example/.terraform || true cd test - terraform init && terraform apply -auto-approve \ No newline at end of file + terraform init && terraform apply -auto-approve +clean: + rm example/terraform.tfstate* || true + rm -rf example/.terraform || true + rm example/terraform-provider-orion || true + rm example/log || true diff --git a/data_source_subnet.go b/data_source_subnet.go index 799d304..78ec3f0 100644 --- a/data_source_subnet.go +++ b/data_source_subnet.go @@ -22,7 +22,7 @@ func dataSourceSubnet() *schema.Resource { Computed: true, }, "cidr": &schema.Schema{ - Type: schema.TypeString, + Type: schema.TypeInt, Computed: true, }, "vlan": &schema.Schema{ @@ -79,6 +79,7 @@ func dataSourceSubnetRead(d *schema.ResourceData, meta interface{}) error { } log.Infof("Subnet found: %s", s) + log.Infof("CIDR found: %s", s.CIDR) d.SetId(s.VLAN) d.Set("address", s.Address) d.Set("cidr", s.CIDR) diff --git a/example/main.tf b/example/main.tf index 387e0e4..f92f366 100644 --- a/example/main.tf +++ b/example/main.tf @@ -19,4 +19,8 @@ output "orion_ip" { output "orion_subnet" { value = data.orion_subnet.test.address +} + +output "orion_cidr" { + value = data.orion_subnet.test.cidr } \ No newline at end of file