kubernetes-client/haskell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #81 from akshaymankar/hoauth2-bump

Browse Source 
Support hoauth2 >= 1.11
This commit is contained in:
Kubernetes Prow Robot
2020-12-04 08:47:59 -08:00
committed by GitHub
parent a9d6705e8c 88f1efe236
commit ddc20d4eb2
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kubernetes-client/package.yaml
View File

@@ -1,5 +1,5 @@
name: kubernetes-client name: kubernetes-client
version: 0.3.1.0 version: 0.3.2.0
description: | description: |
Client library for interacting with a Kubernetes cluster. Client library for interacting with a Kubernetes cluster.
@@ -45,7 +45,7 @@ dependencies:
- data-default-class >=0.1 - data-default-class >=0.1
- either >=5.0 - either >=5.0
- filepath >=1.4 - filepath >=1.4
- hoauth2 >=1.8 - hoauth2 >=1.11
- http-client >=0.5 && <0.7 - http-client >=0.5 && <0.7
- http-client-tls >=0.3 - http-client-tls >=0.3
- jose-jwt >=0.8 - jose-jwt >=0.8

2
kubernetes-client/src/Kubernetes/Client/Auth/OIDC.hs
View File

@@ -94,7 +94,7 @@ fetchToken auth@(OIDCAuth{..}) = do
tokenURI <- parseURI strictURIParserOptions (Text.encodeUtf8 tokenEndpoint) tokenURI <- parseURI strictURIParserOptions (Text.encodeUtf8 tokenEndpoint)
& either (throwM . OIDCURIException) pure & either (throwM . OIDCURIException) pure
let oauth = OAuth2{ oauthClientId = clientID let oauth = OAuth2{ oauthClientId = clientID
, oauthClientSecret = clientSecret , oauthClientSecret = Just clientSecret
, oauthAccessTokenEndpoint = tokenURI , oauthAccessTokenEndpoint = tokenURI
, oauthOAuthorizeEndpoint = tokenURI , oauthOAuthorizeEndpoint = tokenURI
, oauthCallback = Nothing , oauthCallback = Nothing

1
stack.yaml
View File

@@ -3,6 +3,7 @@ extra-deps:
- jsonpath-0.1.0.1 - jsonpath-0.1.0.1
- jwt-0.10.0 - jwt-0.10.0
- oidc-client-0.4.0.0 - oidc-client-0.4.0.0
- hoauth2-1.16.0
packages: packages:
- kubernetes - kubernetes
- kubernetes-client - kubernetes-client

7
stack.yaml.lock
View File

@@ -25,6 +25,13 @@ packages:
sha256: 68c285c6365360975d50bbb18cb07755d5ef19af8bf0e998d3ea46d35ef4a4e1 sha256: 68c285c6365360975d50bbb18cb07755d5ef19af8bf0e998d3ea46d35ef4a4e1
original: original:
hackage: oidc-client-0.4.0.0 hackage: oidc-client-0.4.0.0
- completed:
hackage: hoauth2-1.16.0@sha256:161b20369ce80cd8348e448e3b307e7850c3d21e8ae4f1e258dbd04d0da34a65,5629
pantry-tree:
size: 2046
sha256: 55931b378faa4a89275c572ecf9a5ec65a7a71f092819e4f704a285a7d4f6f35
original:
hackage: hoauth2-1.16.0
snapshots: snapshots:
- completed: - completed:
size: 523700 size: 523700