[Resource][Data Source] ACR Scope Map and Tokens #9402

Lucretius · 2020-11-19T17:44:31Z

Data Source for azurerm_container_registry_token
Data Source for azurerm_container_registry_scope_map
Resource for azurerm_container_registry_token
Resource for azurerm_container_registry_scope_map
Documentation for each
Tests for each, they all pass running against my own Azure environment.

There are passwords for the token which I would like to expose but there is no way to delete them once generated so they didn't really fit into the lifecycle management of the token itself. Perhaps they might be better suited as a separate data source, similar to how we handle the SAS tokens?

Also note that these are still both preview features. As such I've vendor-included the SDK preview code and only used it in these specific preview features (see client.go)

This PR resolves #6505

shashken · 2021-01-12T09:13:38Z

@Lucretius @tombuildsstuff Any updates on this PR?

katbyte

Hi @Lucretius - sorry for the delay in reviewing this, overall it looks good but we'll need to fix up the merge conflicts and move to the new testing framework. Once thats done this should be good to merge!

katbyte · 2021-02-01T23:57:10Z

azurerm/internal/services/containers/container_registry_scope_map_resource.go

+	ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
+	defer cancel()
+
+	id, err := azure.ParseAzureResourceID(d.Id())


We'll want to use the new generated ID parsers here

katbyte · 2021-02-01T23:57:31Z

azurerm/internal/services/containers/container_registry_scope_map_resource.go

+				MinItems: 1,
+				Elem: &schema.Schema{
+					Type: schema.TypeString,
+				},


could we validate this?

katbyte · 2021-02-01T23:57:39Z

azurerm/internal/services/containers/container_registry_scope_map_resource.go

+			"description": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},


Could we validate this?

katbyte · 2021-02-01T23:57:44Z

azurerm/internal/services/containers/container_registry_scope_map_resource.go

+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},


could we validate this?

katbyte · 2021-02-01T23:58:16Z

azurerm/internal/services/containers/container_registry_token_resource.go

+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},


could we validaate this?

katbyte · 2021-02-01T23:59:05Z

azurerm/internal/services/containers/tests/container_registry_scope_map_data_source_test.go

@@ -0,0 +1,52 @@
+package tests


We'll need to change this to the new testing frame work to support binary testing

katbyte · 2021-02-01T23:59:48Z

website/docs/r/container_registry_scope_map.html.markdown

+
+# azurerm_container_registry_scope_map
+
+Manages an Azure Container Registry scope map.  Scope Maps are a preview feature only available in Premium SKU Container registries.


If this is preview is there a feature to enable?

katbyte · 2021-02-02T00:00:13Z

website/docs/r/container_registry_token.html.markdown

+Manages an Azure Container Registry token.  Tokens are a preview feature only available in Premium SKU Container registries.
+
+```hcl
+resource "azurerm_resource_group" "rg" {


could we use example for all names

Suggested change

resource "azurerm_resource_group" "rg" {

resource "azurerm_resource_group" "example" {

katbyte · 2021-02-02T00:00:25Z

website/docs/r/container_registry_token.html.markdown

+
+```hcl
+resource "azurerm_resource_group" "rg" {
+  name     = "resourceGroup1"


Suggested change

name = "resourceGroup1"

name = "example-resource-group"

katbyte · 2021-02-02T00:00:43Z

website/docs/r/container_registry_token.html.markdown

+}
+
+resource "azurerm_container_registry" "acr" {
+  name                     = "containerRegistry1"


Suggested change

name = "containerRegistry1"

name = "ExampleRegistry"

and so forth

katbyte · 2021-04-16T22:16:26Z

closing as this PR has been superseded by #11350

@Lucretius

Supersede #9402 after email exchange with @Lucretius which didn't have time to complete it currently. I fixed the comments from last review. Data Source for azurerm_container_registry_token Data Source for azurerm_container_registry_scope_map Resource for azurerm_container_registry_token Resource for azurerm_container_registry_scope_map Documentation for each Tests for each, they all pass running against my own Azure environment. There are passwords for the token which I would like to expose but there is no way to delete them once generated so they didn't really fit into the lifecycle management of the token itself. Perhaps they might be better suited as a separate data source, similar to how we handle the SAS tokens? Also note that these are still both preview features. As such I've vendor-included the SDK preview code and only used it in these specific preview features (see client.go) This PR resolves #6505

@Lucretius

Supersede hashicorp#9402 after email exchange with @Lucretius which didn't have time to complete it currently. I fixed the comments from last review. Data Source for azurerm_container_registry_token Data Source for azurerm_container_registry_scope_map Resource for azurerm_container_registry_token Resource for azurerm_container_registry_scope_map Documentation for each Tests for each, they all pass running against my own Azure environment. There are passwords for the token which I would like to expose but there is no way to delete them once generated so they didn't really fit into the lifecycle management of the token itself. Perhaps they might be better suited as a separate data source, similar to how we handle the SAS tokens? Also note that these are still both preview features. As such I've vendor-included the SDK preview code and only used it in these specific preview features (see client.go) This PR resolves hashicorp#6505

ghost · 2021-04-30T02:22:13Z

This has been released in version 2.57.0 of the provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading. As an example:

provider "azurerm" {
    version = "~> 2.57.0"
}
# ... other configuration ...

github-actions · 2021-05-30T02:43:34Z

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

Lucretius added 7 commits November 16, 2020 23:20

resource for token, scope map, datasrc scope map

e544b5b

add docs, test for data sources

f7a0a33

download vendored deps, revert old resource deps

e2fb724

fix build issue, add tests

19068f5

run all tests, fix issues with tests passing

011abda

terrafmt markdown blocks, manually do test blocks

4662f74

revert go.sum changes

ea5355c

ghost added size/XXL dependencies documentation labels Nov 19, 2020

Lucretius added 3 commits November 19, 2020 09:50

Merge branch 'master' into acr_token_scope_map

b6421d1

remove unused vars causing linting issues

179560f

run terrafmt on test blocks

c12e4ef

katbyte requested changes Feb 2, 2021

View reviewed changes

katbyte added the waiting-response label Feb 4, 2021

MattiasAng mentioned this pull request Apr 16, 2021

[Resource][Data Source] ACR Scope Map and Tokens #11350

Merged

katbyte added this to the v2.57.0 milestone Apr 16, 2021

katbyte closed this Apr 16, 2021

github-actions bot locked as resolved and limited conversation to collaborators May 30, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Resource][Data Source] ACR Scope Map and Tokens #9402

[Resource][Data Source] ACR Scope Map and Tokens #9402

Lucretius commented Nov 19, 2020 •

edited

Loading

shashken commented Jan 12, 2021

katbyte left a comment

katbyte Feb 1, 2021

katbyte Feb 1, 2021

katbyte Feb 1, 2021

katbyte Feb 1, 2021

katbyte Feb 1, 2021

katbyte Feb 1, 2021

katbyte Feb 1, 2021

katbyte Feb 2, 2021

katbyte Feb 2, 2021

katbyte Feb 2, 2021

katbyte commented Apr 16, 2021

ghost commented Apr 30, 2021

github-actions bot commented May 30, 2021


		# azurerm_container_registry_scope_map

		Manages an Azure Container Registry scope map. Scope Maps are a preview feature only available in Premium SKU Container registries.

	resource "azurerm_resource_group" "rg" {
	resource "azurerm_resource_group" "example" {

[Resource][Data Source] ACR Scope Map and Tokens #9402

[Resource][Data Source] ACR Scope Map and Tokens #9402

Conversation

Lucretius commented Nov 19, 2020 • edited Loading

shashken commented Jan 12, 2021

katbyte left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

katbyte commented Apr 16, 2021

ghost commented Apr 30, 2021

github-actions bot commented May 30, 2021

Lucretius commented Nov 19, 2020 •

edited

Loading