Move apierr and httplog in databricks

databricks · Jan 8, 2025 · 53d5eda · 53d5eda
1 parent 23d9c1e
commit 53d5eda
Show file tree

Hide file tree

Showing 36 changed files with 24 additions and 24 deletions.
diff --git a/client/client_test.go b/client/client_test.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
 	"github.com/databricks/databricks-sdk-go/config"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/internal/env"
 	"github.com/databricks/databricks-sdk-go/useragent"
 	"github.com/databricks/databricks-sdk-go/version"

diff --git a/config/api_client.go b/config/api_client.go
@@ -8,8 +8,8 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
 	"github.com/databricks/databricks-sdk-go/config/credentials"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/httpclient"
 	"github.com/databricks/databricks-sdk-go/useragent"
 )

diff --git a/config/auth_azure_msi_test.go b/config/auth_azure_msi_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/httpclient/fixtures"
 	"github.com/databricks/databricks-sdk-go/logger"
 	"github.com/stretchr/testify/require"

diff --git a/config/azure.go b/config/azure.go
@@ -9,7 +9,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/httpclient"
 	"github.com/databricks/databricks-sdk-go/logger"
 	"golang.org/x/oauth2"

diff --git a/apierr/error_mapping.go → databricks/apierr/error_mapping.go b/apierr/error_mapping.go → databricks/apierr/error_mapping.go
diff --git a/apierr/error_override.go → databricks/apierr/error_override.go b/apierr/error_override.go → databricks/apierr/error_override.go
diff --git a/apierr/error_override_test.go → databricks/apierr/error_override_test.go b/apierr/error_override_test.go → databricks/apierr/error_override_test.go
diff --git a/apierr/error_overrides.go → databricks/apierr/error_overrides.go b/apierr/error_overrides.go → databricks/apierr/error_overrides.go
diff --git a/apierr/errors.go → databricks/apierr/errors.go b/apierr/errors.go → databricks/apierr/errors.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 
 	"github.com/databricks/databricks-sdk-go/common"
+	"github.com/databricks/databricks-sdk-go/databricks/httplog"
 	"github.com/databricks/databricks-sdk-go/logger"
-	"github.com/databricks/databricks-sdk-go/logger/httplog"
 )
 
 const (

diff --git a/apierr/errors_test.go → databricks/apierr/errors_test.go b/apierr/errors_test.go → databricks/apierr/errors_test.go
diff --git a/apierr/private_link.go → databricks/apierr/private_link.go b/apierr/private_link.go → databricks/apierr/private_link.go
diff --git a/apierr/unwrap.go → databricks/apierr/unwrap.go b/apierr/unwrap.go → databricks/apierr/unwrap.go
diff --git a/apierr/unwrap_test.go → databricks/apierr/unwrap_test.go b/apierr/unwrap_test.go → databricks/apierr/unwrap_test.go
diff --git a/logger/httplog/body_logger.go → databricks/httplog/body_logger.go b/logger/httplog/body_logger.go → databricks/httplog/body_logger.go
diff --git a/logger/httplog/body_logger_test.go → databricks/httplog/body_logger_test.go b/logger/httplog/body_logger_test.go → databricks/httplog/body_logger_test.go
diff --git a/logger/httplog/round_trip_stringer.go → databricks/httplog/round_trip_stringer.go b/logger/httplog/round_trip_stringer.go → databricks/httplog/round_trip_stringer.go
diff --git a/logger/httplog/round_trip_stringer_test.go → ...ricks/httplog/round_trip_stringer_test.go b/logger/httplog/round_trip_stringer_test.go → ...ricks/httplog/round_trip_stringer_test.go
diff --git a/error_alias.go b/error_alias.go
diff --git a/httpclient/api_client.go b/httpclient/api_client.go
@@ -13,9 +13,9 @@ import (
 	"time"
 
 	"github.com/databricks/databricks-sdk-go/common"
+	"github.com/databricks/databricks-sdk-go/databricks/httplog"
 	"github.com/databricks/databricks-sdk-go/httpclient/traceparent"
 	"github.com/databricks/databricks-sdk-go/logger"
-	"github.com/databricks/databricks-sdk-go/logger/httplog"
 	"github.com/databricks/databricks-sdk-go/retries"
 	"github.com/databricks/databricks-sdk-go/useragent"
 	"golang.org/x/oauth2"

diff --git a/httpclient/response.go b/httpclient/response.go
@@ -11,8 +11,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
 	"github.com/databricks/databricks-sdk-go/common"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/logger"
 )
 

diff --git a/internal/acceptance_test.go b/internal/acceptance_test.go
@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/databricks/databricks-sdk-go"
-	"github.com/databricks/databricks-sdk-go/apierr"
 	"github.com/databricks/databricks-sdk-go/config"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/internal/env"
 	"github.com/databricks/databricks-sdk-go/logger"
 	"github.com/databricks/databricks-sdk-go/service/compute"

diff --git a/internal/account_test.go b/internal/account_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/service/iam"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/internal/catalog_test.go b/internal/catalog_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/retries"
 	"github.com/databricks/databricks-sdk-go/service/catalog"
 	"github.com/databricks/databricks-sdk-go/service/sql"

diff --git a/internal/connections_test.go b/internal/connections_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/service/catalog"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/internal/deployment_test.go b/internal/deployment_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/retries"
 	"github.com/databricks/databricks-sdk-go/service/provisioning"
 	"github.com/stretchr/testify/assert"

diff --git a/internal/jobs_test.go b/internal/jobs_test.go
@@ -3,7 +3,7 @@ package internal
 import (
 	"testing"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/service/compute"
 	"github.com/databricks/databricks-sdk-go/service/jobs"
 	"github.com/stretchr/testify/assert"

diff --git a/internal/scim_test.go b/internal/scim_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/databricks/databricks-sdk-go"
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/service/iam"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/qa/http_fixture.go b/qa/http_fixture.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
 	"github.com/databricks/databricks-sdk-go/client"
 	"github.com/databricks/databricks-sdk-go/config"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/qa/lock/databricks/databricks_backend.go b/qa/lock/databricks/databricks_backend.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/databricks/databricks-sdk-go"
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/qa/lock/core"
 	"github.com/databricks/databricks-sdk-go/service/workspace"
 )

diff --git a/qa/lock/databricks/databricks_backend_test.go b/qa/lock/databricks/databricks_backend_test.go
@@ -7,7 +7,7 @@ import (
 	"io"
 	"testing"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/experimental/mocks"
 	"github.com/databricks/databricks-sdk-go/qa/lock/core"
 	"github.com/databricks/databricks-sdk-go/service/workspace"

diff --git a/retries/retries_test.go b/retries/retries_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/service/compute/ext_commands_test.go b/service/compute/ext_commands_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
 	"github.com/databricks/databricks-sdk-go/client"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/qa"
 )
 

diff --git a/service/compute/ext_library_utilities.go b/service/compute/ext_library_utilities.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/logger"
 	"github.com/databricks/databricks-sdk-go/retries"
 	"github.com/databricks/databricks-sdk-go/useragent"

diff --git a/service/compute/ext_utilities.go b/service/compute/ext_utilities.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/logger"
 	"github.com/databricks/databricks-sdk-go/retries"
 )

diff --git a/service/files/ext_utilities.go b/service/files/ext_utilities.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/useragent"
 )
 

diff --git a/service/workspace/ext_utilities.go b/service/workspace/ext_utilities.go
@@ -9,7 +9,7 @@ import (
 	"mime/multipart"
 	"strings"
 
-	"github.com/databricks/databricks-sdk-go/apierr"
+	"github.com/databricks/databricks-sdk-go/databricks/apierr"
 	"github.com/databricks/databricks-sdk-go/service/compute"
 	"github.com/databricks/databricks-sdk-go/useragent"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ import ( @@
     	"fmt"
     	"io"
-    	"github.com/databricks/databricks-sdk-go/apierr"
+    	"github.com/databricks/databricks-sdk-go/databricks/apierr"
     	"github.com/databricks/databricks-sdk-go/useragent"
     )
@@ Expand Down @@