jsii-release 0.2.1024 → 0.2.1026

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/bin/publib-npm +7 -2
  2. package/bin/publib-nuget +8 -2
  3. package/bin/publib-pypi +9 -3
  4. package/package.json +8 -8
  5. package/package.json.bak +8 -8
package/bin/publib-npm CHANGED
@@ -21,6 +21,11 @@ set -eu
21
21
 
22
22
  dir="${1:-"dist/js"}"
23
23
 
24
+ # Evaluate trusted publisher flag once as boolean
25
+ use_trusted_publisher=false
26
+ if [ -n "${NPM_TRUSTED_PUBLISHER:-}" ] && [ "${NPM_TRUSTED_PUBLISHER}" != "false" ]; then
27
+ use_trusted_publisher=true
28
+ fi
24
29
 
25
30
  if ! [ -z "${NPM_REGISTRY:-}" ] && [[ $NPM_REGISTRY =~ .codeartifact.*.amazonaws.com ]]; then
26
31
  codeartifact_account="$(echo $NPM_REGISTRY | cut -d. -f1 | rev | cut -d- -f1 | rev)"
@@ -35,12 +40,12 @@ if ! [ -z "${NPM_REGISTRY:-}" ] && [[ $NPM_REGISTRY =~ .codeartifact.*.amazonaws
35
40
  export AWS_SESSION_TOKEN="$(echo $credentials | cut -d' ' -f5)"
36
41
  fi
37
42
  NPM_TOKEN=`aws codeartifact get-authorization-token --domain $codeartifact_domain --domain-owner $codeartifact_account --region $codeartifact_region --query authorizationToken --output text`
38
- elif [ -z "${NPM_TOKEN:-}" ] && [ -z "${NPM_TRUSTED_PUBLISHER:-}" ]; then
43
+ elif [ -z "${NPM_TOKEN:-}" ] && [ "$use_trusted_publisher" = "false" ]; then
39
44
  echo "NPM_TOKEN=<token> or NPM_TRUSTED_PUBLISHER=true is required"
40
45
  exit 1
41
46
  fi
42
47
 
43
- if ! [ -z "${NPM_TRUSTED_PUBLISHER:-}" ]; then
48
+ if [ "$use_trusted_publisher" = "true" ]; then
44
49
  unset NPM_TOKEN
45
50
  fi
46
51
 
package/bin/publib-nuget CHANGED
@@ -28,8 +28,14 @@ set -eu # we don't want "pipefail" to implement idempotency
28
28
 
29
29
  cd "${1:-"dist/dotnet"}"
30
30
 
31
+ # Evaluate trusted publisher flag once as boolean
32
+ use_trusted_publisher=false
33
+ if [ -n "${NUGET_TRUSTED_PUBLISHER:-}" ] && [ "${NUGET_TRUSTED_PUBLISHER}" != "false" ]; then
34
+ use_trusted_publisher=true
35
+ fi
36
+
31
37
  # Check for Trusted Publisher authentication
32
- if [ -n "${NUGET_TRUSTED_PUBLISHER:-}" ]; then
38
+ if [ "$use_trusted_publisher" = "true" ]; then
33
39
  echo "Using NuGet Trusted Publisher authentication"
34
40
 
35
41
  if [ -z "${NUGET_USERNAME:-}" ]; then
@@ -59,7 +65,7 @@ if [ -n "${NUGET_TRUSTED_PUBLISHER:-}" ]; then
59
65
  echo "Failed to exchange OIDC token for NuGet API key"
60
66
  exit 1
61
67
  fi
62
- elif [ -z "${NUGET_API_KEY:-}" ]; then
68
+ elif [ -z "${NUGET_API_KEY:-}" ] && [ "$use_trusted_publisher" = "false" ]; then
63
69
  echo "NUGET_API_KEY is required or set NUGET_TRUSTED_PUBLISHER=1 with NUGET_USERNAME"
64
70
  exit 1
65
71
  fi
package/bin/publib-pypi CHANGED
@@ -18,13 +18,19 @@ set -euo pipefail
18
18
 
19
19
  cd "${1:-"dist/python"}"
20
20
 
21
+ # Evaluate trusted publisher flag once as boolean
22
+ use_trusted_publisher=false
23
+ if [ -n "${PYPI_TRUSTED_PUBLISHER:-}" ] && [ "${PYPI_TRUSTED_PUBLISHER}" != "false" ]; then
24
+ use_trusted_publisher=true
25
+ fi
26
+
21
27
  if [ -z "$(ls *.whl)" ]; then
22
28
  echo "cannot find any .whl files in $PWD"
23
29
  exit 1
24
30
  fi
25
31
 
26
32
  # Validate credentials before installing packages
27
- if [ -z "${PYPI_TRUSTED_PUBLISHER:-}" ]; then
33
+ if [ "$use_trusted_publisher" = "false" ]; then
28
34
  [ -z "${TWINE_USERNAME:-}" ] && {
29
35
  echo "Missing TWINE_USERNAME (required when not using Trusted Publishers)"
30
36
  exit 1
@@ -41,7 +47,7 @@ upload_opts="--verbose --skip-existing"
41
47
 
42
48
  # Install required packages
43
49
  packages="twine<6.2.0"
44
- if [ -n "${PYPI_TRUSTED_PUBLISHER:-}" ]; then
50
+ if [ "$use_trusted_publisher" = "true" ]; then
45
51
  packages="$packages id"
46
52
 
47
53
  if [ -z "${PYPI_DISABLE_ATTESTATIONS:-}" ]; then
@@ -54,7 +60,7 @@ fi
54
60
  python3 -m pip install --user --upgrade $packages
55
61
 
56
62
  # Check for Trusted Publisher
57
- if [ -n "${PYPI_TRUSTED_PUBLISHER:-}" ]; then
63
+ if [ "$use_trusted_publisher" = "true" ]; then
58
64
  echo "Using PyPI Trusted Publisher authentication"
59
65
 
60
66
  # Determine audience based on repository
package/package.json CHANGED
@@ -53,7 +53,7 @@
53
53
  "organization": true
54
54
  },
55
55
  "devDependencies": {
56
- "@aws-sdk/client-sts": "^3.895.0",
56
+ "@aws-sdk/client-sts": "^3.958.0",
57
57
  "@stylistic/eslint-plugin": "^2",
58
58
  "@types/glob": "^8.1.0",
59
59
  "@types/jest": "^27.5.2",
@@ -61,7 +61,7 @@
61
61
  "@types/yargs": "^17",
62
62
  "@typescript-eslint/eslint-plugin": "^8",
63
63
  "@typescript-eslint/parser": "^8",
64
- "cdklabs-projen-project-types": "^0.3.1",
64
+ "cdklabs-projen-project-types": "^0.3.12",
65
65
  "commit-and-tag-version": "^12",
66
66
  "constructs": "^10.0.0",
67
67
  "eslint": "^9",
@@ -69,22 +69,22 @@
69
69
  "eslint-plugin-import": "^2.32.0",
70
70
  "jest": "^27.5.1",
71
71
  "jest-junit": "^16",
72
- "projen": "^0.92.9",
72
+ "projen": "^0.98.32",
73
73
  "ts-jest": "^27.1.5",
74
74
  "ts-node": "^10.9.2",
75
75
  "typescript": "~5.7"
76
76
  },
77
77
  "dependencies": {
78
- "@aws-sdk/client-codeartifact": "^3.908.0",
79
- "@aws-sdk/credential-providers": "^3.908.0",
80
- "@aws-sdk/types": "^3.901.0",
78
+ "@aws-sdk/client-codeartifact": "^3.958.0",
79
+ "@aws-sdk/credential-providers": "^3.958.0",
80
+ "@aws-sdk/types": "^3.957.0",
81
81
  "@types/fs-extra": "^8.0.0",
82
82
  "fs-extra": "^8.0.0",
83
83
  "glob": "10.0.0",
84
84
  "p-queue": "6",
85
85
  "shlex": "^2.1.2",
86
86
  "yargs": "^17",
87
- "zx": "^8.8.4"
87
+ "zx": "^8.8.5"
88
88
  },
89
89
  "main": "lib/index.js",
90
90
  "license": "Apache-2.0",
@@ -92,7 +92,7 @@
92
92
  "publishConfig": {
93
93
  "access": "public"
94
94
  },
95
- "version": "0.2.1024",
95
+ "version": "0.2.1026",
96
96
  "jest": {
97
97
  "coverageProvider": "v8",
98
98
  "testMatch": [
package/package.json.bak CHANGED
@@ -53,7 +53,7 @@
53
53
  "organization": true
54
54
  },
55
55
  "devDependencies": {
56
- "@aws-sdk/client-sts": "^3.895.0",
56
+ "@aws-sdk/client-sts": "^3.958.0",
57
57
  "@stylistic/eslint-plugin": "^2",
58
58
  "@types/glob": "^8.1.0",
59
59
  "@types/jest": "^27.5.2",
@@ -61,7 +61,7 @@
61
61
  "@types/yargs": "^17",
62
62
  "@typescript-eslint/eslint-plugin": "^8",
63
63
  "@typescript-eslint/parser": "^8",
64
- "cdklabs-projen-project-types": "^0.3.1",
64
+ "cdklabs-projen-project-types": "^0.3.12",
65
65
  "commit-and-tag-version": "^12",
66
66
  "constructs": "^10.0.0",
67
67
  "eslint": "^9",
@@ -69,22 +69,22 @@
69
69
  "eslint-plugin-import": "^2.32.0",
70
70
  "jest": "^27.5.1",
71
71
  "jest-junit": "^16",
72
- "projen": "^0.92.9",
72
+ "projen": "^0.98.32",
73
73
  "ts-jest": "^27.1.5",
74
74
  "ts-node": "^10.9.2",
75
75
  "typescript": "~5.7"
76
76
  },
77
77
  "dependencies": {
78
- "@aws-sdk/client-codeartifact": "^3.908.0",
79
- "@aws-sdk/credential-providers": "^3.908.0",
80
- "@aws-sdk/types": "^3.901.0",
78
+ "@aws-sdk/client-codeartifact": "^3.958.0",
79
+ "@aws-sdk/credential-providers": "^3.958.0",
80
+ "@aws-sdk/types": "^3.957.0",
81
81
  "@types/fs-extra": "^8.0.0",
82
82
  "fs-extra": "^8.0.0",
83
83
  "glob": "10.0.0",
84
84
  "p-queue": "6",
85
85
  "shlex": "^2.1.2",
86
86
  "yargs": "^17",
87
- "zx": "^8.8.4"
87
+ "zx": "^8.8.5"
88
88
  },
89
89
  "main": "lib/index.js",
90
90
  "license": "Apache-2.0",
@@ -92,7 +92,7 @@
92
92
  "publishConfig": {
93
93
  "access": "public"
94
94
  },
95
- "version": "0.2.1024",
95
+ "version": "0.2.1026",
96
96
  "jest": {
97
97
  "coverageProvider": "v8",
98
98
  "testMatch": [