mirror of
https://github.com/openai/codex.git
synced 2026-11-13 14:46:14 +00:00
Remove first-party type from app metadata (#34844)
## What changed Remove `first_party_type` from connector app metadata and the app-server v2 protocol. Update metadata conversion and merge paths, generated JSON and TypeScript schemas, and affected test fixtures to match. GitOrigin-RevId: 3f2e56eca68352360d8c0d99d48486ae65d664c1
This commit is contained in:
1 parent
400ee190c3
commit
79500d3cc1
14 files changed
+1
-46
No files matched your search
@@ -353,12 +353,6 @@
|
|||||||
"null"
|
"null"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"firstPartyType": {
|
|
||||||
"type": [
|
|
||||||
"string",
|
|
||||||
"null"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"review": {
|
"review": {
|
||||||
"anyOf": [
|
"anyOf": [
|
||||||
{
|
{
|
||||||
|
|||||||
-6
@@ -6619,12 +6619,6 @@
|
|||||||
"null"
|
"null"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"firstPartyType": {
|
|
||||||
"type": [
|
|
||||||
"string",
|
|
||||||
"null"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"review": {
|
"review": {
|
||||||
"anyOf": [
|
"anyOf": [
|
||||||
{
|
{
|
||||||
|
|||||||
-6
@@ -635,12 +635,6 @@
|
|||||||
"null"
|
"null"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"firstPartyType": {
|
|
||||||
"type": [
|
|
||||||
"string",
|
|
||||||
"null"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"review": {
|
"review": {
|
||||||
"anyOf": [
|
"anyOf": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -175,12 +175,6 @@
|
|||||||
"null"
|
"null"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"firstPartyType": {
|
|
||||||
"type": [
|
|
||||||
"string",
|
|
||||||
"null"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"review": {
|
"review": {
|
||||||
"anyOf": [
|
"anyOf": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -175,12 +175,6 @@
|
|||||||
"null"
|
"null"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"firstPartyType": {
|
|
||||||
"type": [
|
|
||||||
"string",
|
|
||||||
"null"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"review": {
|
"review": {
|
||||||
"anyOf": [
|
"anyOf": [
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,4 +4,4 @@
|
|||||||
import type { AppReview } from "./AppReview";
|
import type { AppReview } from "./AppReview";
|
||||||
import type { AppScreenshot } from "./AppScreenshot";
|
import type { AppScreenshot } from "./AppScreenshot";
|
||||||
|
|
||||||
export type AppMetadata = { review: AppReview | null, categories: Array<string> | null, subCategories: Array<string> | null, seoDescription: string | null, screenshots: Array<AppScreenshot> | null, developer: string | null, version: string | null, versionId: string | null, versionNotes: string | null, firstPartyType: string | null, firstPartyRequiresInstall: boolean | null, showInComposerWhenUnlinked: boolean | null, };
|
export type AppMetadata = { review: AppReview | null, categories: Array<string> | null, subCategories: Array<string> | null, seoDescription: string | null, screenshots: Array<AppScreenshot> | null, developer: string | null, version: string | null, versionId: string | null, versionNotes: string | null, firstPartyRequiresInstall: boolean | null, showInComposerWhenUnlinked: boolean | null, };
|
||||||
@@ -107,7 +107,6 @@ pub struct AppMetadata {
|
|||||||
pub version: Option<String>,
|
pub version: Option<String>,
|
||||||
pub version_id: Option<String>,
|
pub version_id: Option<String>,
|
||||||
pub version_notes: Option<String>,
|
pub version_notes: Option<String>,
|
||||||
pub first_party_type: Option<String>,
|
|
||||||
pub first_party_requires_install: Option<bool>,
|
pub first_party_requires_install: Option<bool>,
|
||||||
pub show_in_composer_when_unlinked: Option<bool>,
|
pub show_in_composer_when_unlinked: Option<bool>,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -149,7 +149,6 @@ fn app_metadata_to_api(metadata: AppMetadata) -> ApiAppMetadata {
|
|||||||
version,
|
version,
|
||||||
version_id,
|
version_id,
|
||||||
version_notes,
|
version_notes,
|
||||||
first_party_type,
|
|
||||||
first_party_requires_install,
|
first_party_requires_install,
|
||||||
show_in_composer_when_unlinked,
|
show_in_composer_when_unlinked,
|
||||||
} = metadata;
|
} = metadata;
|
||||||
@@ -164,7 +163,6 @@ fn app_metadata_to_api(metadata: AppMetadata) -> ApiAppMetadata {
|
|||||||
version,
|
version,
|
||||||
version_id,
|
version_id,
|
||||||
version_notes,
|
version_notes,
|
||||||
first_party_type,
|
|
||||||
first_party_requires_install,
|
first_party_requires_install,
|
||||||
show_in_composer_when_unlinked,
|
show_in_composer_when_unlinked,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -596,7 +596,6 @@ async fn list_apps_emits_updates_and_returns_after_both_lists_load() -> Result<(
|
|||||||
version: Some("1.2.3".to_string()),
|
version: Some("1.2.3".to_string()),
|
||||||
version_id: Some("version_123".to_string()),
|
version_id: Some("version_123".to_string()),
|
||||||
version_notes: Some("Fixes and improvements".to_string()),
|
version_notes: Some("Fixes and improvements".to_string()),
|
||||||
first_party_type: Some("internal".to_string()),
|
|
||||||
first_party_requires_install: Some(true),
|
first_party_requires_install: Some(true),
|
||||||
show_in_composer_when_unlinked: Some(true),
|
show_in_composer_when_unlinked: Some(true),
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -497,7 +497,6 @@ fn app_response(id: &str, name: &str, icon_url: Option<&str>) -> Value {
|
|||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"version_id": "version-1",
|
"version_id": "version-1",
|
||||||
"version_notes": "Initial release",
|
"version_notes": "Initial release",
|
||||||
"first_party_type": "must-not-escape",
|
|
||||||
"first_party_requires_install": true,
|
"first_party_requires_install": true,
|
||||||
"show_in_composer_when_unlinked": true,
|
"show_in_composer_when_unlinked": true,
|
||||||
"subtitle": "must-not-escape",
|
"subtitle": "must-not-escape",
|
||||||
|
|||||||
@@ -1678,7 +1678,6 @@ async fn plugin_read_returns_app_metadata_category() -> Result<()> {
|
|||||||
version: None,
|
version: None,
|
||||||
version_id: None,
|
version_id: None,
|
||||||
version_notes: None,
|
version_notes: None,
|
||||||
first_party_type: None,
|
|
||||||
first_party_requires_install: None,
|
first_party_requires_install: None,
|
||||||
show_in_composer_when_unlinked: None,
|
show_in_composer_when_unlinked: None,
|
||||||
}),
|
}),
|
||||||
@@ -1784,7 +1783,6 @@ async fn plugin_read_hides_apps_for_api_key_auth() -> Result<()> {
|
|||||||
version: None,
|
version: None,
|
||||||
version_id: None,
|
version_id: None,
|
||||||
version_notes: None,
|
version_notes: None,
|
||||||
first_party_type: None,
|
|
||||||
first_party_requires_install: None,
|
first_party_requires_install: None,
|
||||||
show_in_composer_when_unlinked: None,
|
show_in_composer_when_unlinked: None,
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -51,7 +51,6 @@ pub struct AppMetadata {
|
|||||||
pub version: Option<String>,
|
pub version: Option<String>,
|
||||||
pub version_id: Option<String>,
|
pub version_id: Option<String>,
|
||||||
pub version_notes: Option<String>,
|
pub version_notes: Option<String>,
|
||||||
pub first_party_type: Option<String>,
|
|
||||||
pub first_party_requires_install: Option<bool>,
|
pub first_party_requires_install: Option<bool>,
|
||||||
pub show_in_composer_when_unlinked: Option<bool>,
|
pub show_in_composer_when_unlinked: Option<bool>,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -429,11 +429,6 @@ fn merge_directory_app(existing: &mut DirectoryApp, incoming: DirectoryApp) {
|
|||||||
{
|
{
|
||||||
existing_app_metadata.version_notes = incoming_app_metadata.version_notes;
|
existing_app_metadata.version_notes = incoming_app_metadata.version_notes;
|
||||||
}
|
}
|
||||||
if existing_app_metadata.first_party_type.is_none()
|
|
||||||
&& incoming_app_metadata.first_party_type.is_some()
|
|
||||||
{
|
|
||||||
existing_app_metadata.first_party_type = incoming_app_metadata.first_party_type;
|
|
||||||
}
|
|
||||||
if existing_app_metadata.first_party_requires_install.is_none()
|
if existing_app_metadata.first_party_requires_install.is_none()
|
||||||
&& incoming_app_metadata.first_party_requires_install.is_some()
|
&& incoming_app_metadata.first_party_requires_install.is_some()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -100,7 +100,6 @@ fn app_metadata_from_api(metadata: ApiAppMetadata) -> AppMetadata {
|
|||||||
version,
|
version,
|
||||||
version_id,
|
version_id,
|
||||||
version_notes,
|
version_notes,
|
||||||
first_party_type,
|
|
||||||
first_party_requires_install,
|
first_party_requires_install,
|
||||||
show_in_composer_when_unlinked,
|
show_in_composer_when_unlinked,
|
||||||
} = metadata;
|
} = metadata;
|
||||||
@@ -119,7 +118,6 @@ fn app_metadata_from_api(metadata: ApiAppMetadata) -> AppMetadata {
|
|||||||
version,
|
version,
|
||||||
version_id,
|
version_id,
|
||||||
version_notes,
|
version_notes,
|
||||||
first_party_type,
|
|
||||||
first_party_requires_install,
|
first_party_requires_install,
|
||||||
show_in_composer_when_unlinked,
|
show_in_composer_when_unlinked,
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user