Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

udpate openapi-generator commit; fixes for ghc-9 #91

Merged
merged 1 commit into from
Sep 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 17 additions & 19 deletions kubernetes-client/kubernetes-client.cabal
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.33.0.
-- This file has been generated from package.yaml by hpack version 0.34.4.
--
-- see: https://github.com/sol/hpack
--
-- hash: 34e35369e85904c2f5b73f96e2a3784f236e4b0af7bca64db21da93ee922c7d0

name: kubernetes-client
version: 0.4.0.0
version: 0.4.1.0
synopsis: Client library for Kubernetes
description: Client library for interacting with a Kubernetes cluster.
.
Expand Down Expand Up @@ -48,22 +46,22 @@ library
ghc-options: -Wall
build-depends:
aeson >=1.2 && <1.6
, attoparsec >=0.13 && <0.14
, attoparsec >=0.13
, base >=4.7 && <5.0
, base64-bytestring
, bytestring >=0.10 && <0.11
, bytestring >=0.10
, connection >=0.2
, containers >=0.5
, data-default-class >=0.1
, either >=5.0
, filepath >=1.4
, hoauth2 >=1.11
, http-client >=0.5 && <0.7
, http-client >=0.5 && <0.8
, http-client-tls >=0.3
, jose-jwt >=0.8
, jsonpath >=0.1 && <0.3
, kubernetes-client-core ==0.4.0.0
, microlens >=0.4 && <0.5
, kubernetes-client-core ==0.4.1.0
, microlens >=0.4
, mtl >=2.2
, oidc-client >=0.4
, pem >=0.2
Expand Down Expand Up @@ -92,23 +90,23 @@ test-suite example
example
build-depends:
aeson >=1.2 && <1.6
, attoparsec >=0.13 && <0.14
, attoparsec >=0.13
, base >=4.7 && <5.0
, base64-bytestring
, bytestring >=0.10 && <0.11
, bytestring >=0.10
, connection >=0.2
, containers >=0.5
, data-default-class >=0.1
, either >=5.0
, filepath >=1.4
, hoauth2 >=1.11
, http-client >=0.5 && <0.7
, http-client >=0.5 && <0.8
, http-client-tls >=0.3
, jose-jwt >=0.8
, jsonpath >=0.1 && <0.3
, kubernetes-client
, kubernetes-client-core ==0.4.0.0
, microlens >=0.4 && <0.5
, kubernetes-client-core ==0.4.1.0
, microlens >=0.4
, mtl >=2.2
, oidc-client >=0.4
, pem >=0.2
Expand Down Expand Up @@ -142,10 +140,10 @@ test-suite spec
test
build-depends:
aeson >=1.2 && <1.6
, attoparsec >=0.13 && <0.14
, attoparsec >=0.13
, base >=4.7 && <5.0
, base64-bytestring
, bytestring >=0.10 && <0.11
, bytestring >=0.10
, connection >=0.2
, containers >=0.5
, data-default-class >=0.1
Expand All @@ -155,13 +153,13 @@ test-suite spec
, hoauth2 >=1.11
, hspec
, hspec-attoparsec
, http-client >=0.5 && <0.7
, http-client >=0.5 && <0.8
, http-client-tls >=0.3
, jose-jwt >=0.8
, jsonpath >=0.1 && <0.3
, kubernetes-client
, kubernetes-client-core ==0.4.0.0
, microlens >=0.4 && <0.5
, kubernetes-client-core ==0.4.1.0
, microlens >=0.4
, mtl >=2.2
, oidc-client >=0.4
, pem >=0.2
Expand Down
12 changes: 6 additions & 6 deletions kubernetes-client/package.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: kubernetes-client
version: 0.4.0.0
version: 0.4.1.0
description: |
Client library for interacting with a Kubernetes cluster.

Expand Down Expand Up @@ -36,21 +36,21 @@ extra-source-files:
dependencies:
- base >=4.7 && <5.0
- base64-bytestring
- bytestring >=0.10 && <0.11
- bytestring >=0.10
- aeson >=1.2 && <1.6
- attoparsec >=0.13 && <0.14
- attoparsec >=0.13
- jsonpath >=0.1 && <0.3
- connection >=0.2
- containers >= 0.5
- data-default-class >=0.1
- either >=5.0
- filepath >=1.4
- hoauth2 >=1.11
- http-client >=0.5 && <0.7
- http-client >=0.5 && <0.8
- http-client-tls >=0.3
- jose-jwt >=0.8
- kubernetes-client-core ==0.4.0.0
- microlens >=0.4 && <0.5
- kubernetes-client-core ==0.4.1.0
- microlens >=0.4
- mtl >=2.2
- oidc-client >=0.4
- pem >=0.2
Expand Down
4 changes: 2 additions & 2 deletions kubernetes/.openapi-generator/COMMIT
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Requested Commit: 4526ca2610e4c3812521ea226f421664435c9053
Actual Commit: 4526ca2610e4c3812521ea226f421664435c9053
Requested Commit: df877a8cf9b5e2b7a02c6e88dc4767b1e25c0b6f
Actual Commit: df877a8cf9b5e2b7a02c6e88dc4767b1e25c0b6f
2 changes: 1 addition & 1 deletion kubernetes/.openapi-generator/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.0.1-SNAPSHOT
5.3.0-SNAPSHOT
7 changes: 3 additions & 4 deletions kubernetes/git_push.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh
# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
#
# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update" "gitlab.com"
# Usage example: /bin/sh ./git_push.sh wing328 openapi-petstore-perl "minor update" "gitlab.com"

git_user_id=$1
git_repo_id=$2
Expand Down Expand Up @@ -38,14 +38,14 @@ git add .
git commit -m "$release_note"

# Sets the new remote
git_remote=`git remote`
git_remote=$(git remote)
if [ "$git_remote" = "" ]; then # git remote not defined

if [ "$GIT_TOKEN" = "" ]; then
echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
git remote add origin https://${git_host}/${git_user_id}/${git_repo_id}.git
else
git remote add origin https://${git_user_id}:${GIT_TOKEN}@${git_host}/${git_user_id}/${git_repo_id}.git
git remote add origin https://${git_user_id}:"${GIT_TOKEN}"@${git_host}/${git_user_id}/${git_repo_id}.git
fi

fi
Expand All @@ -55,4 +55,3 @@ git pull origin master
# Pushes (Forces) the changes in the local repository up to the remote repository
echo "Git pushing to https://${git_host}/${git_user_id}/${git_repo_id}.git"
git push origin master 2>&1 | grep -v 'To https'

10 changes: 5 additions & 5 deletions kubernetes/kubernetes-client-core.cabal
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: kubernetes-client-core
version: 0.4.0.0
version: 0.4.1.0
synopsis: Auto-generated kubernetes-client-core API Client
description: .
Client library for calling the Kubernetes API based on http-client.
Expand Down Expand Up @@ -38,18 +38,18 @@ library
aeson >=1.0 && <2.0
, base >=4.7 && <5.0
, base64-bytestring >1.0 && <2.0
, bytestring >=0.10.0 && <0.11
, bytestring >=0.10.0
, case-insensitive
, containers >=0.5.0.0 && <0.8
, deepseq >= 1.4 && <1.6
, exceptions >= 0.4
, http-api-data >= 0.3.4 && <0.5
, http-client >=0.5 && <0.7
, http-client >=0.5 && <0.8
, http-client-tls
, http-media >= 0.4 && < 0.9
, http-types >=0.8 && <0.13
, iso8601-time >=0.1.3 && <0.2.0
, microlens >= 0.4.3 && <0.5
, microlens >= 0.4.3
, mtl >=2.2.1
, network >=2.6.2 && <3.9
, random >=1.1
Expand Down Expand Up @@ -165,7 +165,7 @@ test-suite tests
, QuickCheck
, aeson
, base >=4.7 && <5.0
, bytestring >=0.10.0 && <0.11
, bytestring >=0.10.0
, containers
, hspec >=1.8
, iso8601-time
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ import qualified Prelude as P
--
-- AuthMethod: 'AuthApiKeyBearerToken'
--
getAPIGroup
getAPIGroup
:: Accept accept -- ^ request accept ('MimeType')
-> KubernetesRequest GetAPIGroup MimeNoContent V1APIGroup accept
getAPIGroup _ =
Expand Down
Loading