Merge pull request #663 from dbt-msft/fix/dev-settings

fix(dev): devcontainer settings, fix keyring, add package init

Author: axellpadilla

.devcontainer/devcontainer.json

@@ -2,10 +2,23 @@
     "name": "Python 3",
     "image": "mcr.microsoft.com/devcontainers/python:3.10-bookworm",
     "features": {
-        "ghcr.io/devcontainers/features/docker-in-docker:2.17.0": {}
+        "ghcr.io/devcontainers/features/docker-in-docker:2.17.0": {
+            "moby": false
+        }
     },
-    "forwardPorts": [1433],
+    "forwardPorts": [
+        1433
+    ],
     "postStartCommand": "/bin/bash ./.devcontainer/setup_odbc.sh && /bin/bash ./.devcontainer/setup_env.sh",
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "python-envs.alwaysUseUv": true,
+                "python-envs.terminal.autoActivationType": "shellStartup",
+                "python.defaultInterpreterPath": "${containerWorkspaceFolder}/.venv/bin/python"
+            }
+        }
+    },
     "containerEnv": {
         "SQLSERVER_TEST_DRIVER": "ODBC Driver 18 for SQL Server",
         "SQLSERVER_TEST_HOST": "127.0.0.1",

.devcontainer/setup_odbc.sh

@@ -1,4 +1,6 @@
-curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc
+curl https://packages.microsoft.com/keys/microsoft.asc \
+  | gpg --dearmor \
+  | sudo tee /usr/share/keyrings/microsoft-prod.gpg >/dev/null
 
 #Download appropriate package for the OS version
 #Choose only ONE of the following, corresponding to your OS version

dbt/__init__.py

@@ -0,0 +1,3 @@
+from pkgutil import extend_path
+
+__path__ = extend_path(__path__, __name__)

dbt/adapters/sqlserver/__init__.py

@@ -1,5 +1,4 @@
 from dbt.adapters.base import AdapterPlugin
-
 from dbt.adapters.sqlserver.sqlserver_adapter import SQLServerAdapter
 from dbt.adapters.sqlserver.sqlserver_column import SQLServerColumn
 from dbt.adapters.sqlserver.sqlserver_configs import SQLServerConfigs

dbt/adapters/sqlserver/relation_configs/policies.py

@@ -1,8 +1,9 @@
 from dataclasses import dataclass
 
-from dbt.adapters.contracts.relation import Policy
 from dbt_common.dataclass_schema import StrEnum
 
+from dbt.adapters.contracts.relation import Policy
+
 MAX_CHARACTERS_IN_IDENTIFIER = 127
 
 

dbt/adapters/sqlserver/sqlserver_adapter.py

@@ -2,14 +2,6 @@
 
 import agate
 import dbt_common.exceptions
-from dbt.adapters.base.column import Column as BaseColumn
-from dbt.adapters.base.impl import ConstraintSupport
-from dbt.adapters.base.meta import available
-from dbt.adapters.base.relation import BaseRelation
-from dbt.adapters.capability import Capability, CapabilityDict, CapabilitySupport, Support
-from dbt.adapters.events.types import SchemaCreation
-from dbt.adapters.reference_keys import _make_ref_key_dict
-from dbt.adapters.sql.impl import CREATE_SCHEMA_MACRO_NAME, SQLAdapter
 from dbt_common.behavior_flags import BehaviorFlag
 from dbt_common.contracts.constraints import (
     ColumnLevelConstraint,
@@ -18,6 +10,14 @@
 )
 from dbt_common.events.functions import fire_event
 
+from dbt.adapters.base.column import Column as BaseColumn
+from dbt.adapters.base.impl import ConstraintSupport
+from dbt.adapters.base.meta import available
+from dbt.adapters.base.relation import BaseRelation
+from dbt.adapters.capability import Capability, CapabilityDict, CapabilitySupport, Support
+from dbt.adapters.events.types import SchemaCreation
+from dbt.adapters.reference_keys import _make_ref_key_dict
+from dbt.adapters.sql.impl import CREATE_SCHEMA_MACRO_NAME, SQLAdapter
 from dbt.adapters.sqlserver.sqlserver_column import SQLServerColumn
 from dbt.adapters.sqlserver.sqlserver_configs import SQLServerConfigs
 from dbt.adapters.sqlserver.sqlserver_connections import SQLServerConnectionManager

dbt/adapters/sqlserver/sqlserver_column.py

@@ -1,8 +1,9 @@
 from typing import Any, ClassVar, Dict
 
-from dbt.adapters.base.column import Column
 from dbt_common.exceptions import DbtRuntimeError
 
+from dbt.adapters.base.column import Column
+
 
 class SQLServerColumn(Column):
     TYPE_LABELS: ClassVar[Dict[str, str]] = {

dbt/adapters/sqlserver/sqlserver_connections.py

@@ -38,15 +38,15 @@ class AccessToken:  # type: ignore[no-redef]
     ManagedIdentityCredential = None
     _AZURE_IDENTITY_IMPORT_ERROR = exc
 
-from dbt.adapters.contracts.connection import AdapterResponse, Connection, ConnectionState
-from dbt.adapters.events.logging import AdapterLogger
-from dbt.adapters.events.types import AdapterEventDebug, ConnectionUsed, SQLQuery, SQLQueryStatus
-from dbt.adapters.sql.connections import SQLConnectionManager
 from dbt_common.clients.agate_helper import empty_table
 from dbt_common.events.contextvars import get_node_info
 from dbt_common.events.functions import fire_event
 from dbt_common.utils.casting import cast_to_str
 
+from dbt.adapters.contracts.connection import AdapterResponse, Connection, ConnectionState
+from dbt.adapters.events.logging import AdapterLogger
+from dbt.adapters.events.types import AdapterEventDebug, ConnectionUsed, SQLQuery, SQLQueryStatus
+from dbt.adapters.sql.connections import SQLConnectionManager
 from dbt.adapters.sqlserver import __version__
 from dbt.adapters.sqlserver.sqlserver_credentials import SQLServerCredentials
 

dbt/adapters/sqlserver/sqlserver_relation.py

@@ -1,16 +1,16 @@
 from dataclasses import dataclass, field
 from typing import Optional, Type
 
-from dbt.adapters.base.relation import BaseRelation, EventTimeFilter
-from dbt.adapters.utils import classproperty
 from dbt_common.exceptions import DbtRuntimeError
 
+from dbt.adapters.base.relation import BaseRelation, EventTimeFilter
 from dbt.adapters.sqlserver.relation_configs import (
     MAX_CHARACTERS_IN_IDENTIFIER,
     SQLServerIncludePolicy,
     SQLServerQuotePolicy,
     SQLServerRelationType,
 )
+from dbt.adapters.utils import classproperty
 
 
 @dataclass(frozen=True, eq=False, repr=False)

tests/functional/adapter/dbt/test_aliases.py

@@ -1,4 +1,5 @@
 import pytest
+
 from dbt.tests.adapter.aliases import fixtures
 from dbt.tests.adapter.aliases.test_aliases import (
     BaseAliasErrors,