Merge pull request #39 from JuliaComputing/tan/misc

use Downloads.jl instead of HTTP.jl

Author: tanmaykm

.github/workflows/ci.yml

@@ -0,0 +1,55 @@
+name: CI
+on:
+  push:
+    branches: [master]
+    tags: ["*"]
+  pull_request:
+jobs:
+  test:
+    name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - '1.3'
+          - '1' # automatically expands to the latest stable 1.x release of Julia
+          - nightly
+        os:
+          - ubuntu-latest
+        arch:
+          - x64
+          - x86
+        include:
+          # test macOS and Windows with latest Julia only
+          - os: macOS-latest
+            arch: x64
+            version: 1
+          - os: windows-latest
+            arch: x64
+            version: 1
+          - os: windows-latest
+            arch: x86
+            version: 1
+    steps:
+      - uses: actions/checkout@v2
+      - uses: julia-actions/setup-julia@v1
+        with:
+          version: ${{ matrix.version }}
+          arch: ${{ matrix.arch }}
+      - uses: actions/cache@v1
+        env:
+          cache-name: cache-artifacts
+        with:
+          path: ~/.julia/artifacts
+          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
+          restore-keys: |
+            ${{ runner.os }}-test-${{ env.cache-name }}-
+            ${{ runner.os }}-test-
+            ${{ runner.os }}-
+      - uses: julia-actions/julia-buildpkg@v1
+      - uses: julia-actions/julia-runtest@v1
+      - uses: julia-actions/julia-processcoverage@v1
+      - uses: codecov/codecov-action@v1
+        with:
+          file: lcov.info

Project.toml

@@ -4,19 +4,19 @@ authors = ["Tanmay Mohapatra <[email protected]>"]
 keywords = ["kubernetes", "client"]
 license = "MIT"
 desc = "Julia Kubernetes Client"
-version = "0.4.3"
+version = "0.5.0"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
-HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
+Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Swagger = "2d69052b-6a58-5cd9-a030-a48559c324ac"
 Retry = "20febd7b-183b-5ae2-ac4a-720e7ce64774"
 
 [compat]
-HTTP = "0.8, 0.9"
-Swagger = "0.2"
+Downloads = "1"
+Swagger = "0.3"
 JSON = "0.21"
 Retry = "0.4"
 julia = "1"

src/Kuber.jl

@@ -2,8 +2,8 @@ module Kuber
 
 using JSON
 using Swagger
-using HTTP
-using Retry, HTTP.IOExtras
+using Downloads
+using Retry
 
 include("api/Kubernetes.jl")
 using .Kubernetes

src/api/Kubernetes.jl

@@ -5,7 +5,6 @@ module Kubernetes
 
 using Random
 using Dates
-using HTTP
 using Swagger
 import Swagger: field_name, property_type, hasproperty, validate_property, SwaggerApi, SwaggerModel
 import Base: convert, propertynames

src/helpers.jl

@@ -51,8 +51,15 @@ end
 kuber_type(ctx::KuberContext, d) = kuber_type(ctx, Any, d)
 kuber_type(ctx::KuberContext, T, data::String) = kuber_type(ctx, T, JSON.parse(data))
 
-function kuber_type(ctx::KuberContext, T, resp::HTTP.Response)
-    ctype = HTTP.header(resp, "Content-Type", "application/json")
+function header(resp::Downloads.Response, name::AbstractString, defaultval::AbstractString)
+    for (n,v) in resp.headers
+        (n == name) && (return v)
+    end
+    return defaultval
+end
+
+function kuber_type(ctx::KuberContext, T, resp::Downloads.Response)
+    ctype = header(resp, "Content-Type", "application/json")
     !is_json_mime(ctype) && return T
     kuber_type(ctx, T, String(copy(resp.body)))
 end
@@ -137,7 +144,7 @@ function fetch_misc_apis_versions(ctx::KuberContext; override=nothing, verbose::
     vers = @repeat max_tries try
         getAPIVersions(ApisApi(ctx.client))
     catch e
-        @retry if isa(e, IOError)
+        @retry if isa(e, Base.IOError)
             @debug("Retrying getAPIVersions")
             sleep(2)
         end
@@ -181,7 +188,7 @@ function fetch_core_version(ctx::KuberContext; override=nothing, verbose::Bool=f
     api_vers = @repeat max_tries try
         getCoreAPIVersions(CoreApi(ctx.client))
     catch e
-        @retry if isa(e, IOError)
+        @retry if isa(e, Base.IOError)
             @debug("Retrying getCoreAPIVersions")
             sleep(2)
         end
@@ -256,7 +263,7 @@ function retry_on_error(f::Function; max_tries=1)
     @repeat max_tries try
         return f()
     catch e
-        @retry if isa(e, IOError)
+        @retry if isa(e, Base.IOError)
             @debug("Retrying Kubernetes API call ...")
             sleep(2)
         end