fix: remove unused net/url import from go (#767)

url.URL type properties were removed in v4 as of 21.8 fixes: #765
looker-open-source · Jul 27, 2021 · 35d912c · 35d912c
1 parent 025618c
commit 35d912c
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 8 deletions.
diff --git a/go/sdk/v4/models.go b/go/sdk/v4/models.go
@@ -36,7 +36,6 @@ package v4
 
 import (
   "github.com/looker-open-source/sdk-codegen/go/rtl"
-  "net/url"
   "time"
 )
 

diff --git a/package.json b/package.json
@@ -43,8 +43,8 @@
     "lint-quiet:es": "eslint 'packages/**/*.ts{,x}' --cache --quiet",
     "lint:ts": "tsc",
     "lint-staged": "yarn exec lint-staged",
-    "lint-changed": "eslint $(git diff --name-only --diff-filter=ACMRTUXB main | grep  -E \"(.js$|.ts$|.tsx$)\") --quiet",
-    "lint-changed-fix": "eslint $(git diff --name-only --diff-filter=ACMRTUXB main | grep  -E \"(.js$|.ts$|.tsx$)\") --quiet --fix",
+    "lint-changed": "eslint $(git diff --name-only --diff-filter=ACMRTUXB origin/main | grep  -E \"(.js$|.ts$|.tsx$)\") --quiet",
+    "lint-changed-fix": "eslint $(git diff --name-only --diff-filter=ACMRTUXB origin/main | grep  -E \"(.js$|.ts$|.tsx$)\") --quiet --fix",
     "lint:spec": "SUPPRESS_NO_CONFIG_WARNING=1 ts-node -O '{ \"module\": \"commonjs\", \"target\": \"es2019\" }' packages/sdk-codegen-scripts/scripts/specLinter.ts",
     "refresh": "SUPPRESS_NO_CONFIG_WARNING=1 ts-node -O '{ \"module\": \"commonjs\", \"target\": \"es2019\" }' packages/sdk-codegen-scripts/scripts/refresh_specs.ts",
     "register": "SUPPRESS_NO_CONFIG_WARNING=1 ts-node -O '{ \"module\": \"commonjs\", \"target\": \"es2019\" }' packages/sdk-codegen-scripts/scripts/register.ts",

diff --git a/packages/sdk-codegen/src/go.gen.spec.ts b/packages/sdk-codegen/src/go.gen.spec.ts
@@ -34,6 +34,41 @@ const gen = new GoGen(apiTestModel)
 const indent = ''
 
 describe('Go generator', () => {
+  describe('bookends', () => {
+    it('has a v3 models prologue', () => {
+      const origPkgName = gen.packageName
+      gen.packageName = gen.apiVersion = 'v3'
+      const prologue = gen.modelsPrologue('')
+      gen.packageName = gen.apiVersion = origPkgName
+      expect(prologue).toEqual(`
+// NOTE: Do not edit this file generated by Looker SDK Codegen for API v3
+
+package v3
+
+import (
+  "github.com/looker-open-source/sdk-codegen/go/rtl"
+  "net/url"
+  "time"
+)
+`)
+    })
+    it('has a default models prologue', () => {
+      const origPkgName = gen.packageName
+      gen.packageName = gen.apiVersion = 'v4'
+      const prologue = gen.modelsPrologue('')
+      gen.packageName = gen.apiVersion = origPkgName
+      expect(prologue).toEqual(`
+// NOTE: Do not edit this file generated by Looker SDK Codegen for API v4
+
+package v4
+
+import (
+  "github.com/looker-open-source/sdk-codegen/go/rtl"
+  "time"
+)
+`)
+    })
+  })
   describe('comment header', () => {
     it('is empty with no comment', () => {
       expect(gen.commentHeader(indent, '')).toEqual('')

diff --git a/packages/sdk-codegen/src/go.gen.ts b/packages/sdk-codegen/src/go.gen.ts
@@ -375,16 +375,26 @@ func NewLookerSDK(session *rtl.AuthSession) *LookerSDK {
   }
 
   modelsPrologue(_indent: string) {
-    return `
-// ${this.warnEditing()}
-
-package ${this.packageName}
+    let goImport = `
+import (
+  "github.com/looker-open-source/sdk-codegen/go/rtl"
+  "time"
+)`
 
+    // v3 still uses url.URL
+    if (this.packageName === 'v3') {
+      goImport = `
 import (
   "github.com/looker-open-source/sdk-codegen/go/rtl"
   "net/url"
   "time"
-)
+)`
+    }
+    return `
+// ${this.warnEditing()}
+
+package ${this.packageName}
+${goImport}
 `
   }