From 17873cfcad60271eb904526d91d659a088d718f3 Mon Sep 17 00:00:00 2001 From: Grant Limberg Date: Tue, 24 Jan 2023 19:39:19 -0800 Subject: [PATCH] pin progenitor to 0.1.1 (#3) api changes in 0.2.0 are breaking builds. do this until we can further investigate API changes needed for 0.2.0+ --- zerotier-central-api/Cargo.lock | 2 +- zerotier-central-api/Cargo.toml | 4 ++-- zerotier-central-api/openapi.json | 25 +++++++++++++++++++++++++ zerotier-one-api/Cargo.toml | 4 ++-- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/zerotier-central-api/Cargo.lock b/zerotier-central-api/Cargo.lock index baeb1ed..8179f4b 100644 --- a/zerotier-central-api/Cargo.lock +++ b/zerotier-central-api/Cargo.lock @@ -1387,7 +1387,7 @@ dependencies = [ [[package]] name = "zerotier-central-api" -version = "1.1.0" +version = "1.2.1" dependencies = [ "anyhow", "chrono", diff --git a/zerotier-central-api/Cargo.toml b/zerotier-central-api/Cargo.toml index 82d64ed..f8af365 100644 --- a/zerotier-central-api/Cargo.toml +++ b/zerotier-central-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zerotier-central-api" -version = "1.2.0" +version = "1.2.1" edition = "2021" description = "ZeroTier Central API for Rust" authors = ["Erik Hollensbe ", "Adam Ierymenko "] @@ -17,5 +17,5 @@ serde_json = "1.0" [build-dependencies] anyhow = ">=0" -progenitor = ">=0" +progenitor = "0.1.1" serde_json = "1.0" diff --git a/zerotier-central-api/openapi.json b/zerotier-central-api/openapi.json index 2f3cc3f..75a2774 100644 --- a/zerotier-central-api/openapi.json +++ b/zerotier-central-api/openapi.json @@ -1447,6 +1447,31 @@ "$ref": "#/components/schemas/OrganizationMember" }, "description": "List of organization members" + }, + "ssoConfig": { + "type": "object", + "$ref": "#/components/schemas/SsoConfig", + "description": "Organization wide SSO configuration" + } + } + }, + "SsoConfig": { + "type": "object", + "properties": { + "clientId": { + "type": "string", + "example": "oidc-client-id", + "description": "OIDC Client ID" + }, + "issuer": { + "type": "string", + "example": "https://example.com/oidc/auth", + "description": "OIDC Issuer URL" + }, + "enabled": { + "type": "boolean", + "example": true, + "description": "Enabled flag for SSO" } } }, diff --git a/zerotier-one-api/Cargo.toml b/zerotier-one-api/Cargo.toml index fe3ec94..766ba7b 100644 --- a/zerotier-one-api/Cargo.toml +++ b/zerotier-one-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "zerotier-one-api" -version = "1.2.0" +version = "1.2.1" edition = "2021" description = "OpenAPI bindings to the ZeroTierOne JSON API" authors = ["Erik Hollensbe ", "Adam Ierymenko "] @@ -17,5 +17,5 @@ serde_json = "1.0" [build-dependencies] anyhow = ">=0" -progenitor = ">=0" +progenitor = "0.1.1" serde_json = "1.0"