Skip to content

Commit

Permalink
Fix Python type hints for arrays and dicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@lblackstone
lblackstone committed Sep 10, 2020
1 parent 50d4540 commit 0008f8e
Show file tree
Hide file tree
Showing 303 changed files with 3,004 additions and 3,000 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## HEAD (Unreleased)

### Bug Fixes

- Fix Python type hints for arrays and dicts (https://github.com/pulumi/pulumi-kubernetes/pull/1313)

## 2.6.0 (September 10, 2020)

Note: There is a minor breaking change in the .NET SDK for Helm v3. As part of the switch to using native
Expand Down
4 changes: 2 additions & 2 deletions provider/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ require (
github.com/onsi/ginkgo v1.12.0 // indirect
github.com/onsi/gomega v1.9.0 // indirect
github.com/pkg/errors v0.9.1
github.com/pulumi/pulumi/pkg/v2 v2.10.0
github.com/pulumi/pulumi/sdk/v2 v2.10.0
github.com/pulumi/pulumi/pkg/v2 v2.10.1-0.20200910215427-dee923d99c01
github.com/pulumi/pulumi/sdk/v2 v2.10.1-0.20200910215427-dee923d99c01
github.com/stretchr/testify v1.6.1
google.golang.org/grpc v1.29.1
helm.sh/helm/v3 v3.3.0
Expand Down
8 changes: 4 additions & 4 deletions provider/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -879,11 +879,11 @@ github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDa
github.com/prometheus/procfs v0.0.8 h1:+fpWZdT24pJBiqJdAwYBjPSk+5YmQzYNPYzQsdzLkt8=
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
github.com/pulumi/pulumi/pkg/v2 v2.10.0 h1:GTUffKvweAzcCZ2Ok44MFY62nT4FY/u+eX8bWlzDs2A=
github.com/pulumi/pulumi/pkg/v2 v2.10.0/go.mod h1:zQWe2D4tYJDeXNzSclqNmP8/SMSKOh8k22AbWg3+mVc=
github.com/pulumi/pulumi/pkg/v2 v2.10.1-0.20200910215427-dee923d99c01 h1:rqcFD49ILFVpJlL+rI8rYTIbK04QYMfas+ymECJfXOM=
github.com/pulumi/pulumi/pkg/v2 v2.10.1-0.20200910215427-dee923d99c01/go.mod h1:zQWe2D4tYJDeXNzSclqNmP8/SMSKOh8k22AbWg3+mVc=
github.com/pulumi/pulumi/sdk/v2 v2.2.1/go.mod h1:QNbWpL4gvf3X0lUFT7TXA2Jo1ff/Ti2l97AyFGYwvW4=
github.com/pulumi/pulumi/sdk/v2 v2.10.0 h1:+BPDjZYGl3AI2hLkLCig1+q7hvo/TAVBLGlzPb0r0kk=
github.com/pulumi/pulumi/sdk/v2 v2.10.0/go.mod h1:x84WPiFiuE+G4kJ5jUYkOxmnQJlWoJaHNeEYdqnCKA4=
github.com/pulumi/pulumi/sdk/v2 v2.10.1-0.20200910215427-dee923d99c01 h1:ee09PWoqM55dZ6C5MymP51AS6JYsN5q26N75ApeNhLA=
github.com/pulumi/pulumi/sdk/v2 v2.10.1-0.20200910215427-dee923d99c01/go.mod h1:x84WPiFiuE+G4kJ5jUYkOxmnQJlWoJaHNeEYdqnCKA4=
github.com/qri-io/starlib v0.4.2-0.20200213133954-ff2e8cd5ef8d/go.mod h1:7DPO4domFU579Ga6E61sB9VFNaniPVwJP5C4bBCu3wA=
github.com/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI=
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
Expand Down
36 changes: 18 additions & 18 deletions provider/pkg/gen/python-templates/helm/v2/helm.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import shutil
import subprocess
from tempfile import mkdtemp, mkstemp
from typing import Any, Callable, List, Optional, TextIO, Tuple, Union
from typing import Any, Callable, Optional, Sequence, TextIO, Tuple, Union

import pulumi.runtime
from pulumi_kubernetes.yaml import _parse_yaml_document
Expand Down Expand Up @@ -369,7 +369,7 @@ class BaseChartOpts:
Optional overrides for chart values.
"""

transformations: Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]]
transformations: Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]]
"""
Optional list of transformations to apply to resources that will be created by this chart prior to
creation. Allows customization of the chart behaviour without directly modifying the chart itself.
Expand All @@ -381,26 +381,26 @@ class BaseChartOpts:
Example: A resource created with resource_prefix="foo" would produce a resource named "foo-resourceName".
"""

api_versions: Optional[List[pulumi.Input[str]]]
api_versions: Optional[Sequence[pulumi.Input[str]]]
"""
Optional kubernetes api versions used for Capabilities.APIVersions.
"""

def __init__(self,
namespace: Optional[pulumi.Input[str]] = None,
values: Optional[pulumi.Inputs] = None,
transformations: Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]] = None,
transformations: Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]] = None,
resource_prefix: Optional[str] = None,
api_versions: Optional[List[pulumi.Input[str]]] = None):
api_versions: Optional[Sequence[pulumi.Input[str]]] = None):
"""
:param Optional[pulumi.Input[str]] namespace: Optional namespace to install chart resources into.
:param Optional[pulumi.Inputs] values: Optional overrides for chart values.
:param Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]] transformations: Optional list
:param Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]] transformations: Optional list
of transformations to apply to resources that will be created by this chart prior to creation.
Allows customization of the chart behaviour without directly modifying the chart itself.
:param Optional[str] resource_prefix: An optional prefix for the auto-generated resource names.
Example: A resource created with resource_prefix="foo" would produce a resource named "foo-resourceName".
:param Optional[List[pulumi.Input[str]]] api_versions: Optional kubernetes api versions used for
:param Optional[Sequence[pulumi.Input[str]]] api_versions: Optional kubernetes api versions used for
Capabilities.APIVersions.
"""
self.namespace = namespace
Expand Down Expand Up @@ -442,20 +442,20 @@ def __init__(self,
chart: pulumi.Input[str],
namespace: Optional[pulumi.Input[str]] = None,
values: Optional[pulumi.Inputs] = None,
transformations: Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]] = None,
transformations: Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]] = None,
resource_prefix: Optional[str] = None,
repo: Optional[pulumi.Input[str]] = None,
version: Optional[pulumi.Input[str]] = None,
fetch_opts: Optional[pulumi.Input[FetchOpts]] = None,
api_versions: Optional[List[pulumi.Input[str]]] = None):
api_versions: Optional[Sequence[pulumi.Input[str]]] = None):
"""
:param pulumi.Input[str] chart: The name of the chart to deploy. If `repo` is provided, this chart name
will be prefixed by the repo name.
Example: repo: "stable", chart: "nginx-ingress" -> "stable/nginx-ingress"
Example: chart: "stable/nginx-ingress" -> "stable/nginx-ingress"
:param Optional[pulumi.Input[str]] namespace: Optional namespace to install chart resources into.
:param Optional[pulumi.Inputs] values: Optional overrides for chart values.
:param Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]] transformations: Optional list of
:param Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]] transformations: Optional list of
transformations to apply to resources that will be created by this chart prior to creation.
Allows customization of the chart behaviour without directly modifying the chart itself.
:param Optional[str] resource_prefix: An optional prefix for the auto-generated resource names.
Expand All @@ -466,7 +466,7 @@ def __init__(self,
the latest version will be deployed.
:param Optional[pulumi.Input[FetchOpts]] fetch_opts: Additional options to customize the
fetching of the Helm chart.
:param Optional[List[pulumi.Input[str]]] api_versions: Optional kubernetes api versions used for
:param Optional[Sequence[pulumi.Input[str]]] api_versions: Optional kubernetes api versions used for
Capabilities.APIVersions.
"""
super(ChartOpts, self).__init__(namespace, values, transformations, resource_prefix, api_versions)
Expand All @@ -490,28 +490,28 @@ def __init__(self,
path: pulumi.Input[str],
namespace: Optional[pulumi.Input[str]] = None,
values: Optional[pulumi.Inputs] = None,
transformations: Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]] = None,
transformations: Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]] = None,
resource_prefix: Optional[str] = None,
api_versions: Optional[List[pulumi.Input[str]]] = None):
api_versions: Optional[Sequence[pulumi.Input[str]]] = None):
"""
:param pulumi.Input[str] path: The path to the chart directory which contains the
`Chart.yaml` file.
:param Optional[pulumi.Input[str]] namespace: Optional namespace to install chart resources into.
:param Optional[pulumi.Inputs] values: Optional overrides for chart values.
:param Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]] transformations: Optional list of
:param Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]] transformations: Optional list of
transformations to apply to resources that will be created by this chart prior to creation.
Allows customization of the chart behaviour without directly modifying the chart itself.
:param Optional[str] resource_prefix: An optional prefix for the auto-generated resource names.
Example: A resource created with resource_prefix="foo" would produce a resource named "foo-resourceName".
:param Optional[List[pulumi.Input[str]]] api_versions: Optional kubernetes api versions used for
:param Optional[Sequence[pulumi.Input[str]]] api_versions: Optional kubernetes api versions used for
Capabilities.APIVersions.
"""

super(LocalChartOpts, self).__init__(namespace, values, transformations, resource_prefix, api_versions)
self.path = path


def _run_helm_cmd(all_config: Tuple[List[Union[str, bytes]], Any]) -> str:
def _run_helm_cmd(all_config: Tuple[Sequence[Union[str, bytes]], Any]) -> str:
cmd, _ = all_config

output = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, check=True)
Expand All @@ -520,7 +520,7 @@ def _run_helm_cmd(all_config: Tuple[List[Union[str, bytes]], Any]) -> str:


def _is_helm_v3() -> bool:
cmd: List[str] = ['helm', 'version', '--short']
cmd: Sequence[str] = ['helm', 'version', '--short']

"""
Helm v2 returns version like this:
Expand Down Expand Up @@ -621,7 +621,7 @@ def _parse_chart(all_config: Tuple[str, Union[ChartOpts, LocalChartOpts], pulumi


def _fetch(chart: str, opts: FetchOpts) -> None:
cmd: List[str] = ['helm', 'fetch', chart]
cmd: Sequence[str] = ['helm', 'fetch', chart]

# Untar by default.
if opts.untar is not False:
Expand Down
30 changes: 15 additions & 15 deletions provider/pkg/gen/python-templates/helm/v3/helm.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# *** Do not edit by hand unless you're certain you know what you are doing! ***

import json
from typing import Any, Callable, List, Optional, Tuple, Union
from typing import Any, Callable, Optional, Sequence, Tuple, Union

import pulumi.runtime
from pulumi_kubernetes.yaml import _parse_yaml_document
Expand Down Expand Up @@ -366,7 +366,7 @@ class BaseChartOpts:
Optional overrides for chart values.
"""

transformations: Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]]
transformations: Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]]
"""
Optional list of transformations to apply to resources that will be created by this chart prior to
creation. Allows customization of the chart behaviour without directly modifying the chart itself.
Expand All @@ -378,26 +378,26 @@ class BaseChartOpts:
Example: A resource created with resource_prefix="foo" would produce a resource named "foo-resourceName".
"""

api_versions: Optional[List[pulumi.Input[str]]]
api_versions: Optional[Sequence[pulumi.Input[str]]]
"""
Optional kubernetes api versions used for Capabilities.APIVersions.
"""

def __init__(self,
namespace: Optional[pulumi.Input[str]] = None,
values: Optional[pulumi.Inputs] = None,
transformations: Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]] = None,
transformations: Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]] = None,
resource_prefix: Optional[str] = None,
api_versions: Optional[List[pulumi.Input[str]]] = None):
api_versions: Optional[Sequence[pulumi.Input[str]]] = None):
"""
:param Optional[pulumi.Input[str]] namespace: Optional namespace to install chart resources into.
:param Optional[pulumi.Inputs] values: Optional overrides for chart values.
:param Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]] transformations: Optional list
:param Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]] transformations: Optional list
of transformations to apply to resources that will be created by this chart prior to creation.
Allows customization of the chart behaviour without directly modifying the chart itself.
:param Optional[str] resource_prefix: An optional prefix for the auto-generated resource names.
Example: A resource created with resource_prefix="foo" would produce a resource named "foo-resourceName".
:param Optional[List[pulumi.Input[str]]] api_versions: Optional kubernetes api versions used for
:param Optional[Sequence[pulumi.Input[str]]] api_versions: Optional kubernetes api versions used for
Capabilities.APIVersions.
"""
self.namespace = namespace
Expand Down Expand Up @@ -443,20 +443,20 @@ def __init__(self,
chart: pulumi.Input[str],
namespace: Optional[pulumi.Input[str]] = None,
values: Optional[pulumi.Inputs] = None,
transformations: Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]] = None,
transformations: Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]] = None,
resource_prefix: Optional[str] = None,
repo: Optional[pulumi.Input[str]] = None,
version: Optional[pulumi.Input[str]] = None,
fetch_opts: Optional[pulumi.Input[FetchOpts]] = None,
api_versions: Optional[List[pulumi.Input[str]]] = None):
api_versions: Optional[Sequence[pulumi.Input[str]]] = None):
"""
:param pulumi.Input[str] chart: The name of the chart to deploy. If `repo` is provided, this chart name
will be prefixed by the repo name.
Example: repo: "stable", chart: "nginx-ingress" -> "stable/nginx-ingress"
Example: chart: "stable/nginx-ingress" -> "stable/nginx-ingress"
:param Optional[pulumi.Input[str]] namespace: Optional namespace to install chart resources into.
:param Optional[pulumi.Inputs] values: Optional overrides for chart values.
:param Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]] transformations: Optional list of
:param Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]] transformations: Optional list of
transformations to apply to resources that will be created by this chart prior to creation.
Allows customization of the chart behaviour without directly modifying the chart itself.
:param Optional[str] resource_prefix: An optional prefix for the auto-generated resource names.
Expand All @@ -467,7 +467,7 @@ def __init__(self,
the latest version will be deployed.
:param Optional[pulumi.Input[FetchOpts]] fetch_opts: Additional options to customize the
fetching of the Helm chart.
:param Optional[List[pulumi.Input[str]]] api_versions: Optional kubernetes api versions used for
:param Optional[Sequence[pulumi.Input[str]]] api_versions: Optional kubernetes api versions used for
Capabilities.APIVersions.
"""
super(ChartOpts, self).__init__(namespace, values, transformations, resource_prefix, api_versions)
Expand All @@ -491,20 +491,20 @@ def __init__(self,
path: pulumi.Input[str],
namespace: Optional[pulumi.Input[str]] = None,
values: Optional[pulumi.Inputs] = None,
transformations: Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]] = None,
transformations: Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]] = None,
resource_prefix: Optional[str] = None,
api_versions: Optional[List[pulumi.Input[str]]] = None):
api_versions: Optional[Sequence[pulumi.Input[str]]] = None):
"""
:param pulumi.Input[str] path: The path to the chart directory which contains the
`Chart.yaml` file.
:param Optional[pulumi.Input[str]] namespace: Optional namespace to install chart resources into.
:param Optional[pulumi.Inputs] values: Optional overrides for chart values.
:param Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]] transformations: Optional list of
:param Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]] transformations: Optional list of
transformations to apply to resources that will be created by this chart prior to creation.
Allows customization of the chart behaviour without directly modifying the chart itself.
:param Optional[str] resource_prefix: An optional prefix for the auto-generated resource names.
Example: A resource created with resource_prefix="foo" would produce a resource named "foo-resourceName".
:param Optional[List[pulumi.Input[str]]] api_versions: Optional kubernetes api versions used for
:param Optional[Sequence[pulumi.Input[str]]] api_versions: Optional kubernetes api versions used for
Capabilities.APIVersions.
"""

Expand Down
6 changes: 3 additions & 3 deletions provider/pkg/gen/python-templates/kustomize/kustomize.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# *** WARNING: this file was generated by the Pulumi Kubernetes codegen tool. ***
# *** Do not edit by hand unless you're certain you know what you are doing! ***

from typing import Any, Callable, List, Optional
from typing import Any, Callable, Optional, Sequence

import pulumi.runtime
import pulumi_kubernetes as k8s
Expand All @@ -21,7 +21,7 @@ def __init__(self,
name: str,
directory: str,
opts: Optional[pulumi.ResourceOptions] = None,
transformations: Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]] = None,
transformations: Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]] = None,
resource_prefix: Optional[str] = None):
"""
Directory is a component representing a collection of resources described by a kustomize directory
Expand Down Expand Up @@ -89,7 +89,7 @@ def omit_resource(obj, opts):
Example: ./helloWorld
Example: https://github.com/kubernetes-sigs/kustomize/tree/master/examples/helloWorld
:param Optional[pulumi.ResourceOptions] opts: A bag of optional settings that control a resource's behavior.
:param Optional[List[Callable[[Any, pulumi.ResourceOptions], None]]] transformations: A set of
:param Optional[Sequence[Callable[[Any, pulumi.ResourceOptions], None]]] transformations: A set of
transformations to apply to Kubernetes resource definitions before registering with engine.
:param Optional[str] resource_prefix: An optional prefix for the auto-generated resource names.
Example: A resource created with resource_prefix="foo" would produce a resource named "foo-resourceName".
Expand Down
Loading

0 comments on commit 0008f8e

Please sign in to comment.