Skip to content

Teach client-generation to accept optional api-version. #201

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.

Sign up for GitHub

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

Merged
ggainey merged 1 commit into from
Aug 19, 2026
Merged

Teach client-generation to accept optional api-version. #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion base/local_scripts/generate_client.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ set -e
declare PROJECT=$1
declare LANGUAGE=$2
declare CONTAINER_NAME=$3 # e.g, oci_env_pulp_1
declare API_VERSION="${4:-v3}" # e.g. v3
echo "generate_client ${API_VERSION}"

if [ ! -d "${SRC_DIR}/pulp-openapi-generator/" ]
then
Expand All @@ -22,4 +24,4 @@ export PULP_URL="${API_PROTOCOL}://${API_HOST}:${API_PORT}"
CONTAINER_LABEL=$("${COMPOSE_BINARY}" container inspect "${CONTAINER_NAME}" | jq -r ".[0].ProcessLabel")
export PULP_MCS_LABEL="${CONTAINER_LABEL#'system_u:system_r:container_t:'}"

./generate.sh "$PROJECT" "$LANGUAGE"
./generate.sh "${PROJECT}" "${LANGUAGE}" "${API_VERSION}"
2 changes: 1 addition & 1 deletion client/oci_env/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ def generate_client(args, client):
env = {**os.environ, **client.config, "PULP_API_ROOT": api_root}

for plugin in plugins:
cmd = base_cmd + [plugin.replace("-", "_"), args.language, container_name]
cmd = base_cmd + [plugin.replace("-", "_"), args.language, container_name, args.api_version]
if args.is_verbose:
print(f"Running local command: {' '.join(cmd)}")

Expand Down
1 change: 1 addition & 0 deletions client/oci_env/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ def parse_generate_client_command(subparsers):
parser.add_argument('plugin', nargs="?", default=None, help="Plugin to generate a client for. If no plugin is specified clients will be generated for all plugins in DEV_SOURCE_PATH.")
parser.add_argument('-l', '--language', default="python", choices=['python', 'ruby'], help="Language to generate a client for. If no language is specified clients will be generated for python.")
parser.add_argument('-i', action='store_true', dest='install_client', help="Deprecated no-op. Python clients are always installed after generating.")
parser.add_argument('-v', '--api-version', default="v3", choices=['v3', 'v4'], dest='api_version', help="API-version to generate the clients for.")

parser.set_defaults(func=generate_client)

Expand Down
Loading