Merge branch 'main' into DVX-318

atlanhq · Jul 9, 2024 · 46022e1 · 46022e1
2 parents fd62c23 + 47edf23
commit 46022e1
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.22.2'
+          go-version: '1.19'
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.2
+0.0.3
diff --git a/atlan/assets/client_test.go b/atlan/assets/client_test.go
@@ -3,12 +3,13 @@ package assets
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/stretchr/testify/assert"
-	"log/slog"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"golang.org/x/exp/slog"
 )
 
 func TestEnvConfig(t *testing.T) {

diff --git a/atlan/logger/logger.go b/atlan/logger/logger.go
@@ -2,8 +2,9 @@ package logger
 
 import (
 	"fmt"
-	"log/slog"
 	"os"
+
+	"golang.org/x/exp/slog"
 )
 
 // LoggerConfig defines the configuration for logging.

diff --git a/go.mod b/go.mod
@@ -1,12 +1,15 @@
 module github.com/atlanhq/atlan-go
 
-go 1.21
+go 1.19
 
 require (
 	github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213
 	github.com/matoous/go-nanoid v1.5.0
 	github.com/schollz/progressbar/v3 v3.14.4
 	github.com/stretchr/testify v1.9.0
+	// NOTE: We need to pin this experimental version of "slog" since it is compatible with Go 1.19
+	// This is required because atlan-heracles uses go-sdk, which currently supports Go 1.19
+	golang.org/x/exp v0.0.0-20240707233637-46b078467d37
 )
 
 require (

diff --git a/go.sum b/go.sum
@@ -36,6 +36,8 @@ golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw=
 golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w=
+golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=