Allow setting access in config in addition to properties (#8635)

.changes/unreleased/Features-20230912-153013.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Allow setting "access" as a config in addition to as a property
+time: 2023-09-12T15:30:13.859595-04:00
+custom:
+  Author: gshank
+  Issue: "8383"

core/dbt/contracts/graph/model_config.py

@@ -14,7 +14,7 @@
 from dbt.contracts.util import Replaceable, list_str
 from dbt.exceptions import DbtInternalError, CompilationError
 from dbt import hooks
-from dbt.node_types import NodeType
+from dbt.node_types import NodeType, AccessType
 from mashumaro.jsonschema.annotations import Pattern
 
 
@@ -518,6 +518,14 @@ def field_mapping(cls):
         return {"post_hook": "post-hook", "pre_hook": "pre-hook"}
 
 
+@dataclass
+class ModelConfig(NodeConfig):
+    access: AccessType = field(
+        default=AccessType.Protected,
+        metadata=MergeBehavior.Update.meta(),
+    )
+
+
 @dataclass
 class SeedConfig(NodeConfig):
     materialized: str = "seed"

core/dbt/contracts/graph/nodes.py

@@ -63,6 +63,7 @@
 
 from .model_config import (
     NodeConfig,
+    ModelConfig,
     SeedConfig,
     TestConfig,
     SourceConfig,
@@ -569,6 +570,7 @@ class HookNode(CompiledNode):
 class ModelNode(CompiledNode):
     resource_type: Literal[NodeType.Model]
     access: AccessType = AccessType.Protected
+    config: ModelConfig = field(default_factory=ModelConfig)
     constraints: List[ModelLevelConstraint] = field(default_factory=list)
     version: Optional[NodeVersion] = None
     latest_version: Optional[NodeVersion] = None
@@ -605,7 +607,7 @@ def from_args(cls, args: ModelNodeArgs) -> "ModelNode":
             path="",
             unrendered_config=unrendered_config,
             depends_on=DependsOn(nodes=args.depends_on_nodes),
-            config=NodeConfig(enabled=args.enabled),
+            config=ModelConfig(enabled=args.enabled),
         )
 
     @property

core/dbt/parser/base.py

@@ -18,9 +18,14 @@
 from dbt.contracts.graph.manifest import Manifest
 from dbt.contracts.graph.nodes import Contract, BaseNode, ManifestNode
 from dbt.contracts.graph.unparsed import Docs, UnparsedNode
-from dbt.exceptions import DbtInternalError, ConfigUpdateError, DictParseError
+from dbt.exceptions import (
+    DbtInternalError,
+    ConfigUpdateError,
+    DictParseError,
+    InvalidAccessTypeError,
+)
 from dbt import hooks
-from dbt.node_types import NodeType, ModelLanguage
+from dbt.node_types import NodeType, ModelLanguage, AccessType
 from dbt.parser.search import FileBlock
 
 # internally, the parser may store a less-restrictive type that will be
@@ -328,6 +333,15 @@ def update_parsed_node_config(
         if "group" in config_dict and config_dict["group"]:
             parsed_node.group = config_dict["group"]
 
+        # If we have access in the config, copy to node level
+        if parsed_node.resource_type == NodeType.Model and config_dict.get("access", None):
+            if AccessType.is_valid(config_dict["access"]):
+                parsed_node.access = AccessType(config_dict["access"])
+            else:
+                raise InvalidAccessTypeError(
+                    unique_id=parsed_node.unique_id, field_value=config_dict["access"]
+                )
+
         # If we have docs in the config, merge with the node level, for backwards
         # compatibility with earlier node-only config.
         if "docs" in config_dict and config_dict["docs"]:

core/dbt/parser/schemas.py

@@ -469,6 +469,7 @@ def get_unparsed_target(self) -> Iterable[NonSourceTarget]:
                     self.normalize_docs_attribute(data, path)
                     self.normalize_group_attribute(data, path)
                     self.normalize_contract_attribute(data, path)
+                    self.normalize_access_attribute(data, path)
                 node = self._target_type().from_dict(data)
             except (ValidationError, JSONValidationError) as exc:
                 raise YamlParseDictError(path, self.key, data, exc)
@@ -503,6 +504,9 @@ def normalize_group_attribute(self, data, path):
     def normalize_contract_attribute(self, data, path):
         return self.normalize_attribute(data, path, "contract")
 
+    def normalize_access_attribute(self, data, path):
+        return self.normalize_attribute(data, path, "access")
+
     def patch_node_config(self, node, patch):
         # Get the ContextConfig that's used in calculating the config
         # This must match the model resource_type that's being patched

schemas/dbt/manifest/v11.json

@@ -10,7 +10,7 @@
         },
         "dbt_version": {
           "type": "string",
-          "default": "1.7.0b1"
+          "default": "1.7.0b2"
         },
         "generated_at": {
           "type": "string"
@@ -1463,6 +1463,203 @@
         "checksum"
       ]
     },
+    "ModelConfig": {
+      "type": "object",
+      "title": "ModelConfig",
+      "properties": {
+        "_extra": {
+          "type": "object",
+          "propertyNames": {
+            "type": "string"
+          }
+        },
+        "enabled": {
+          "type": "boolean",
+          "default": true
+        },
+        "alias": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null
+        },
+        "schema": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null
+        },
+        "database": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null
+        },
+        "tags": {
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "string"
+            }
+          ]
+        },
+        "meta": {
+          "type": "object",
+          "propertyNames": {
+            "type": "string"
+          }
+        },
+        "group": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null
+        },
+        "materialized": {
+          "type": "string",
+          "default": "view"
+        },
+        "incremental_strategy": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null
+        },
+        "persist_docs": {
+          "type": "object",
+          "propertyNames": {
+            "type": "string"
+          }
+        },
+        "post-hook": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/Hook"
+          }
+        },
+        "pre-hook": {
+          "type": "array",
+          "items": {
+            "$ref": "#/$defs/Hook"
+          }
+        },
+        "quoting": {
+          "type": "object",
+          "propertyNames": {
+            "type": "string"
+          }
+        },
+        "column_types": {
+          "type": "object",
+          "propertyNames": {
+            "type": "string"
+          }
+        },
+        "full_refresh": {
+          "anyOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null
+        },
+        "unique_key": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": null
+        },
+        "on_schema_change": {
+          "anyOf": [
+            {
+              "type": "string"
+            },
+            {
+              "type": "null"
+            }
+          ],
+          "default": "ignore"
+        },
+        "on_configuration_change": {
+          "enum": [
+            "apply",
+            "continue",
+            "fail"
+          ]
+        },
+        "grants": {
+          "type": "object",
+          "propertyNames": {
+            "type": "string"
+          }
+        },
+        "packages": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "docs": {
+          "$ref": "#/$defs/Docs"
+        },
+        "contract": {
+          "$ref": "#/$defs/ContractConfig"
+        },
+        "access": {
+          "enum": [
+            "private",
+            "protected",
+            "public"
+          ],
+          "default": "protected"
+        }
+      },
+      "additionalProperties": true
+    },
     "ModelLevelConstraint": {
       "type": "object",
       "title": "ModelLevelConstraint",
@@ -1606,7 +1803,7 @@
           "$ref": "#/$defs/FileHash"
         },
         "config": {
-          "$ref": "#/$defs/NodeConfig"
+          "$ref": "#/$defs/ModelConfig"
         },
         "_event_status": {
           "type": "object",