? (FangSen9000#3)

* feat: fix actions version to root version (apache#2521) * new module added for postman * all language set up * import data * convert to entities * upstream done * parse items * remove 2 * postman * test * build passed * 1st working e.g. * postman success * feat: data loader for postman (passed) * test: add e2e test for postman data loader * test: add UT for postman datalodaer * fix * suffix fixed * removed 0.0.0.0 * fix * test * default to openapi3 * remove fmt * test * c fix * pass * Postman adapter new (FangSen9000#2) * fix * suffix fixed * removed 0.0.0.0 * fix * test * default to openapi3 * remove fmt * test * c fix * pass Co-authored-by: Feng Han <[email protected]> * test * t Co-authored-by: Zeping Bai <[email protected]> Co-authored-by: Feng Han <[email protected]>
zfkube0x1 · Jul 28, 2022 · 448dcce · 448dcce
1 parent 2e78193
commit 448dcce
Show file tree

Hide file tree

Showing 30 changed files with 896 additions and 43 deletions.
diff --git a/.github/workflows/auto-build-rpm.yml b/.github/workflows/auto-build-rpm.yml
@@ -12,7 +12,7 @@ on:
 
 jobs:
   auto_build_rpm:
-    name: auto build rpm package
+    name: Auto Build RPM package
     runs-on: ubuntu-latest
 
     services:
@@ -29,9 +29,9 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v3
 
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-buildx-action@v2
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-apisixdashboard-${{ github.sha }}

diff --git a/.github/workflows/backend-cli-test.yml b/.github/workflows/backend-cli-test.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: cache etcd
         id: cache-etcd
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ${{ github.workspace }}/api/etcd-v${{ matrix.etcd }}-linux-amd64

diff --git a/.github/workflows/backend-e2e-test.yml b/.github/workflows/backend-e2e-test.yml
@@ -26,11 +26,11 @@ jobs:
       - name: setup go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.17"
+          go-version: "1.18"
 
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-buildx-action@v2
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-apisixdashboard-${{ github.sha }}

diff --git a/.github/workflows/backend-unit-test.yml b/.github/workflows/backend-unit-test.yml
@@ -31,9 +31,9 @@ jobs:
       - name: setup go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.15"
+          go-version: "1.18"
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cache/go-build

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -69,4 +69,4 @@ jobs:
       #    make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/deploy-with-docker.yml b/.github/workflows/deploy-with-docker.yml
@@ -25,9 +25,9 @@ jobs:
         with:
           submodules: recursive
 
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-buildx-action@v2
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-apisixdashboard-${{ github.sha }}

diff --git a/.github/workflows/frontend-e2e-test.yml b/.github/workflows/frontend-e2e-test.yml
@@ -44,16 +44,16 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 16.x
           cache: 'yarn'
           cache-dependency-path: web/yarn.lock
 
       - name: Setup golang environment
         uses: actions/setup-go@v3
         with:
-          go-version: '1.15'
+          go-version: '1.18'
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cache/go-build
@@ -69,7 +69,7 @@ jobs:
           nohup go run ./main.go &
 
       - name: Cache Cypress binary
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v3
         id: cypress-binary-cache
         with:
           path: '*/cypress/cache'

diff --git a/.github/workflows/frontend-plugin-e2e-test.yml b/.github/workflows/frontend-plugin-e2e-test.yml
@@ -42,16 +42,16 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 16.x
           cache: 'yarn'
           cache-dependency-path: web/yarn.lock
 
       - name: Setup golang environment
         uses: actions/setup-go@v3
         with:
-          go-version: '1.15'
+          go-version: '1.18'
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cache/go-build
@@ -71,7 +71,7 @@ jobs:
           nohup go run ./main.go &
 
       - name: Cache Cypress binary
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v3
         id: cypress-binary-cache
         with:
           path: '*/cypress/cache'

diff --git a/.github/workflows/go-lint.yml b/.github/workflows/go-lint.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
           version: latest
           working-directory: api
@@ -33,9 +33,9 @@ jobs:
       - name: setup go
         uses: actions/setup-go@v3
         with:
-          go-version: '1.15'
+          go-version: '1.18'
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cache/go-build

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
       - name: 🚀 Use Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: '14.x'
+          node-version: '16.x'
       - run: npm install -g [email protected]
       - run: markdownlint '**/*.md' --ignore node_modules
   misspell:
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3.1.1
+      - uses: actions/setup-python@v4
         with:
           python-version: '3.x'  # Version range or exact version of a Python version to use, using SemVer's version range syntax
           architecture: 'x64'  # optional x64 or x86. Defaults to x64 if not specified

diff --git a/.github/workflows/make-build.yaml b/.github/workflows/make-build.yaml
@@ -41,16 +41,16 @@ jobs:
       - name: Setup Node.js environment
         uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 16.x
           cache: 'yarn'
           cache-dependency-path: web/yarn.lock
 
       - name: Setup golang environment
         uses: actions/setup-go@v3
         with:
-          go-version: '1.15'
+          go-version: '1.18'
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cache/go-build

diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml
@@ -47,7 +47,7 @@ jobs:
         with:
           go-version: '1.15'
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: |
             ~/.cache/go-build

diff --git a/.github/workflows/test-frontend-multiple-node-build.yml b/.github/workflows/test-frontend-multiple-node-build.yml
@@ -25,7 +25,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x]
+        node-version: [12.x, 14.x, 16.x]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

diff --git a/api/go.mod b/api/go.mod
@@ -44,4 +44,5 @@ require (
 	golang.org/x/sys v0.0.0-20210514084401-e8d321eab015 // indirect
 	golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
+        github.com/rbretecher/go-postman-collection v0.8.0
 )
diff --git a/api/go.sum b/api/go.sum
@@ -311,6 +311,7 @@ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFB
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -417,6 +418,8 @@ github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+Gx
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.2.0 h1:wH4vA7pcjKuZzjF7lM8awk4fnuJO6idemZXoKnULUx4=
 github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/rbretecher/go-postman-collection v0.8.0 h1:sW4fKEtZUeUhz4anhFTTKIKrPDU4D+qWBovgB+dXMfE=
+github.com/rbretecher/go-postman-collection v0.8.0/go.mod h1:pptkyjdB/sqPycH+CCa1zrA6Wpj2Kc8Nz846qRstVVs=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
@@ -881,6 +884,7 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=

diff --git a/api/internal/handler/data_loader/loader/postman/export.go b/api/internal/handler/data_loader/loader/postman/export.go
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package postman
+
+import "github.com/apisix/manager-api/internal/handler/data_loader/loader"
+
+func (Loader) Export (data loader.DataSets) (interface{}, error) {
+	panic("Export not supported now")
+}