Support optional arguments in datasourceSchemaFromResourceSchema

Author: timofurrer

internal/provider/data_source_gitlab_project_issue.go

@@ -15,7 +15,7 @@ var _ = registerDataSource("gitlab_project_issue", func() *schema.Resource {
 **Upstream API**: [GitLab API docs](https://docs.gitlab.com/ee/api/issues.html)`,
 
 		ReadContext: dataSourceGitlabProjectIssueRead,
-		Schema:      datasourceSchemaFromResourceSchema(gitlabProjectIssueGetSchema(), []string{"project", "iid"}),
+		Schema:      datasourceSchemaFromResourceSchema(gitlabProjectIssueGetSchema(), []string{"project", "iid"}, nil),
 	}
 })
 

internal/provider/data_source_gitlab_project_issues.go

@@ -206,7 +206,7 @@ var _ = registerDataSource("gitlab_project_issues", func() *schema.Resource {
 				Type:        schema.TypeList,
 				Computed:    true,
 				Elem: &schema.Resource{
-					Schema: datasourceSchemaFromResourceSchema(gitlabProjectIssueGetSchema(), nil),
+					Schema: datasourceSchemaFromResourceSchema(gitlabProjectIssueGetSchema(), nil, nil),
 				},
 			},
 		},

internal/provider/data_source_gitlab_project_tag.go

@@ -17,7 +17,7 @@ var _ = registerDataSource("gitlab_project_tag", func() *schema.Resource {
 
 		ReadContext: dataSourceGitlabProjectTagRead,
 		Schema: constructSchema(
-			datasourceSchemaFromResourceSchema(gitlabProjectTagGetSchema(), []string{"name"}),
+			datasourceSchemaFromResourceSchema(gitlabProjectTagGetSchema(), []string{"name"}, nil),
 			map[string]*schema.Schema{
 				"project": {
 					Description: "The ID or URL-encoded path of the project owned by the authenticated user.",

internal/provider/data_source_gitlab_project_tags.go

@@ -44,7 +44,7 @@ var _ = registerDataSource("gitlab_project_tags", func() *schema.Resource {
 				Type:        schema.TypeList,
 				Computed:    true,
 				Elem: &schema.Resource{
-					Schema: datasourceSchemaFromResourceSchema(gitlabProjectTagGetSchema(), nil),
+					Schema: datasourceSchemaFromResourceSchema(gitlabProjectTagGetSchema(), nil, nil),
 				},
 			},
 		},

internal/provider/data_source_gitlab_repository_file.go

@@ -17,7 +17,7 @@ var _ = registerDataSource("gitlab_repository_file", func() *schema.Resource {
 **Upstream API**: [GitLab REST API docs](https://docs.gitlab.com/ee/api/repository_files.html)`,
 
 		ReadContext: dataSourceGitlabRepositoryFileRead,
-		Schema:      datasourceSchemaFromResourceSchema(gitlabRepositoryFileGetSchema(), []string{"project", "file_path", "ref"}),
+		Schema:      datasourceSchemaFromResourceSchema(gitlabRepositoryFileGetSchema(), []string{"project", "file_path", "ref"}, nil),
 	}
 })
 

internal/provider/util.go

@@ -346,7 +346,7 @@ func attributeNamesFromSchema(schema map[string]*schema.Schema) []string {
 // - all attributes have ForceNew, Required = false
 // - Validation funcs and attributes (e.g. MaxItems) are not copied
 // Adapted from https://github.com/hashicorp/terraform-provider-google/blob/1a72f93a8dcf6f1e59d5f25aefcb6d794a116bf5/google/datasource_helpers.go#L13
-func datasourceSchemaFromResourceSchema(rs map[string]*schema.Schema, arguments []string) map[string]*schema.Schema {
+func datasourceSchemaFromResourceSchema(rs map[string]*schema.Schema, arguments []string, optionalArguments []string) map[string]*schema.Schema {
 	ds := make(map[string]*schema.Schema, len(rs))
 	for k, v := range rs {
 		dv := &schema.Schema{
@@ -362,6 +362,10 @@ func datasourceSchemaFromResourceSchema(rs map[string]*schema.Schema, arguments
 			dv.Required = false
 		}
 
+		if contains(optionalArguments, k) {
+			dv.Optional = true
+		}
+
 		switch v.Type {
 		case schema.TypeSet:
 			dv.Set = v.Set
@@ -373,7 +377,7 @@ func datasourceSchemaFromResourceSchema(rs map[string]*schema.Schema, arguments
 			if elem, ok := v.Elem.(*schema.Resource); ok {
 				// handle the case where the Element is a sub-resource
 				dv.Elem = &schema.Resource{
-					Schema: datasourceSchemaFromResourceSchema(elem.Schema, nil),
+					Schema: datasourceSchemaFromResourceSchema(elem.Schema, nil, nil),
 				}
 			} else {
 				// handle simple primitive case