Merge pull request #5172 from wasmerio/run-470-backend-api-upgrade-sc…

…hema-definitions-to-allow-for-optional

chore(backend-api): Update GraphQL schema

lib/backend-api/schema.graphql

@@ -924,6 +924,7 @@ type DeployAppVersion implements Node {
   sourcePackage: Package!
   aggregateMetrics: AggregateMetrics!
   volumes: [AppVersionVolume]
+  gitSource: AutobuildRepository
   favicon: URL
   screenshot(viewportSize: AppScreenshotViewportSize, appearance: AppScreenshotAppearance): URL
 }
@@ -935,7 +936,7 @@ type DeployApp implements Node & Owner {
   createdBy: User!
   createdAt: DateTime!
   updatedAt: DateTime!
-  activeVersion: DeployAppVersion!
+  activeVersion: DeployAppVersion
   globalName: String!
   globalId: ID!
   viewerCan(action: OwnerAction!): Boolean!
@@ -957,7 +958,7 @@ type DeployApp implements Node & Owner {
   deleted: Boolean!
   favicon: URL
   screenshot(viewportSize: AppScreenshotViewportSize, appearance: AppScreenshotAppearance): URL
-  deployments(offset: Int, before: String, after: String, first: Int, last: Int): AutobuildRepositoryConnection
+  deployments(before: String, after: String, first: Int, last: Int): DeploymentConnection
 }
 
 enum DeployAppVersionsSortBy {
@@ -1144,40 +1145,52 @@ enum AppScreenshotAppearance {
   DARK
 }
 
-type AutobuildRepositoryConnection {
+type DeploymentConnection {
   """Pagination data for this connection."""
   pageInfo: PageInfo!
 
   """Contains the nodes in this connection."""
-  edges: [AutobuildRepositoryEdge]!
-
-  """Total number of items in the connection."""
-  totalCount: Int
+  edges: [DeploymentEdge]!
 }
 
-"""A Relay edge containing a `AutobuildRepository` and its cursor."""
-type AutobuildRepositoryEdge {
+"""A Relay edge containing a `Deployment` and its cursor."""
+type DeploymentEdge {
   """The item at the end of the edge"""
-  node: AutobuildRepository
+  node: Deployment
 
   """A cursor for use in pagination"""
   cursor: String!
 }
 
+union Deployment = NakedDeployment | AutobuildRepository
+
+type NakedDeployment implements Node {
+  """The ID of the object"""
+  id: ID!
+  createdAt: DateTime!
+  updatedAt: DateTime!
+  appVersion: DeployAppVersion
+}
+
 type AutobuildRepository implements Node {
   """The ID of the object"""
   id: ID!
   user: User!
   name: String!
   namespace: String!
-  app: DeployApp
   createdAt: DateTime!
   updatedAt: DateTime!
   appName: String
+  appVersion: DeployAppVersion
   buildId: UUID!
+  buildCmd: String!
+  installCmd: String!
   repoUrl: String!
+  prevCommitHash: String!
+  commitHash: String!
+  commitMessage: String!
+  commitAuthorUsername: String!
   status: StatusEnum!
-  appVersion: DeployAppVersion
   logUrl: String
 }
 
@@ -1190,6 +1203,7 @@ scalar UUID
 enum StatusEnum {
   SUCCESS
   WORKING
+  RUNNING
   FAILURE
   QUEUED
   TIMEOUT
@@ -2456,6 +2470,12 @@ type Query {
   getAppTemplate(slug: String!): AppTemplate
   getAppTemplateCategories(offset: Int, before: String, after: String, first: Int, last: Int): AppTemplateCategoryConnection
   getBuildKinds(offset: Int, before: String, after: String, first: Int, last: Int): BuildKindConnection!
+
+  """Specify if the database name is valid or not."""
+  canDeployDbWithName(
+    """Name of the database"""
+    name: String!
+  ): Boolean!
   viewer: User
   getUser(username: String!): User
   getPasswordResetToken(token: String!): GetPasswordResetToken
@@ -3184,6 +3204,18 @@ type Mutation {
 
   """Delete a database for an app."""
   deleteAppDb(input: DeleteAppDBInput!): DeleteAppDBPayload
+
+  """Get the autobuild config for a given repo"""
+  autobuildConfigForRepo(input: AutobuildConfigForRepoInput!): AutobuildConfigForRepoPayload
+
+  """Add a new github app installation"""
+  installGithubApp(input: InstallGithubAppInput!): InstallGithubAppPayload
+
+  """Detach autobuild from app."""
+  detachAppFromAutobuild(input: DetachAppFromAutobuildInput!): DetachAppFromAutobuildPayload
+
+  """Update autobuild config for an app."""
+  updateAutobuildConfigForApp(input: UpdateAutobuildConfigForAppInput!): UpdateAutobuildConfigForAppPayload
   tokenAuth(input: ObtainJSONWebTokenInput!): ObtainJSONWebTokenPayload
   generateDeployToken(input: GenerateDeployTokenInput!): GenerateDeployTokenPayload
   verifyAccessToken(token: String): Verify
@@ -3708,6 +3740,74 @@ input DeleteAppDBInput {
   clientMutationId: String
 }
 
+"""Get the autobuild config for a given repo"""
+type AutobuildConfigForRepoPayload {
+  """The build configuration"""
+  buildConfig: BuildConfig
+
+  """List of apps deployed with this repo."""
+  deployedApps: [DeployApp]
+  clientMutationId: String
+}
+
+"""The Build Configuration for a given repo"""
+type BuildConfig {
+  buildCmd: String!
+  installCmd: String!
+  setupDb: Boolean!
+  presetName: String!
+  appName: String!
+}
+
+input AutobuildConfigForRepoInput {
+  """The repo URL"""
+  repoUrl: String!
+  clientMutationId: String
+}
+
+"""Add a new github app installation"""
+type InstallGithubAppPayload {
+  success: Boolean!
+  user: User!
+  clientMutationId: String
+}
+
+input InstallGithubAppInput {
+  """Github app Installation ID"""
+  installationId: ID!
+  clientMutationId: String
+}
+
+"""Detach autobuild from app."""
+type DetachAppFromAutobuildPayload {
+  app: DeployApp!
+  clientMutationId: String
+}
+
+input DetachAppFromAutobuildInput {
+  """The ID of the App"""
+  appId: ID!
+  clientMutationId: String
+}
+
+"""Update autobuild config for an app."""
+type UpdateAutobuildConfigForAppPayload {
+  app: DeployApp!
+  clientMutationId: String
+}
+
+input UpdateAutobuildConfigForAppInput {
+  """The ID of the App"""
+  appId: ID!
+
+  """Build command for the app"""
+  buildCmd: String
+
+  """Install command for the app"""
+  installCmd: String
+  clientMutationId: String
+}
+
 type ObtainJSONWebTokenPayload {
   payload: GenericScalar!
   refreshExpiresIn: Int!
@@ -4560,7 +4660,6 @@ type Subscription {
   appIsPublishedFromRepo(repoId: ID!): DeployAppVersion!
   publishAppFromRepoAutobuild(repoUrl: String!, appName: String!, owner: String, buildCmd: String, installCmd: String, databaseName: String, secrets: [SecretInput]): AutobuildLog
   fetchBuildLogs(buildId: String!): String
-  autobuildConfigForRepo(repoUrl: String!): BuildConfig
   packageVersionCreated(publishedBy: ID, ownerId: ID): PackageVersion!
 
   """Subscribe to package version ready"""
@@ -4586,14 +4685,6 @@ enum AutoBuildDeployAppLogKind {
   COMPLETE
 }
 
-"""Log entry for Deploying app from github repo"""
-type BuildConfig {
-  buildCmd: String!
-  installCmd: String!
-  setupDb: Boolean!
-  presetName: String!
-}
-
 type PackageVersionReadyResponse {
   state: PackageVersionState!
   packageVersion: PackageVersion!

lib/backend-api/src/query.rs

@@ -216,7 +216,7 @@ pub async fn get_app_volumes(
         .get_deploy_app
         .context("app not found")?
         .active_version
-        .volumes
+        .and_then(|v| v.volumes)
         .unwrap_or_default()
         .into_iter()
         .flatten()
@@ -1015,7 +1015,7 @@ pub async fn get_deploy_app_versions(
 pub async fn app_deployments(
     client: &WasmerClient,
     vars: types::GetAppDeploymentsVariables,
-) -> Result<Vec<types::AutobuildRepository>, anyhow::Error> {
+) -> Result<Vec<types::Deployment>, anyhow::Error> {
     let res = client
         .run_graphql_strict(types::GetAppDeployments::build(vars))
         .await?;

lib/backend-api/src/types.rs

@@ -832,7 +832,7 @@ mod queries {
     #[derive(cynic::QueryFragment, Debug)]
     #[cynic(graphql_type = "DeployApp")]
     pub(crate) struct AppVolumes {
-        pub active_version: AppVersionVolumes,
+        pub active_version: Option<AppVersionVolumes>,
     }
 
     #[derive(cynic::QueryFragment, Debug)]
@@ -938,7 +938,7 @@ mod queries {
         pub created_at: DateTime,
         pub updated_at: DateTime,
         pub description: Option<String>,
-        pub active_version: DeployAppVersion,
+        pub active_version: Option<DeployAppVersion>,
         pub admin_url: String,
         pub owner: Owner,
         pub url: String,
@@ -1205,21 +1205,38 @@ mod queries {
     pub struct DeployAppDeployments {
         // FIXME: add $offset, $after, currently causes an error from the backend
         // #[arguments(first: $first, after: $after, offset: $offset)]
-        pub deployments: Option<AutobuildRepositoryConnection>,
+        pub deployments: Option<DeploymentConnection>,
     }
 
     #[derive(cynic::QueryFragment, Debug)]
-    pub struct AutobuildRepositoryConnection {
+    pub struct DeploymentConnection {
         pub page_info: PageInfo,
-        pub edges: Vec<Option<AutobuildRepositoryEdge>>,
+        pub edges: Vec<Option<DeploymentEdge>>,
     }
 
     #[derive(cynic::QueryFragment, Debug)]
-    pub struct AutobuildRepositoryEdge {
-        pub node: Option<AutobuildRepository>,
+    pub struct DeploymentEdge {
+        pub node: Option<Deployment>,
     }
 
-    #[derive(cynic::QueryFragment, serde::Serialize, Debug)]
+    #[allow(clippy::large_enum_variant)]
+    #[derive(cynic::InlineFragments, Debug, Clone, Serialize)]
+    pub enum Deployment {
+        AutobuildRepository(AutobuildRepository),
+        NakedDeployment(NakedDeployment),
+        #[cynic(fallback)]
+        Other,
+    }
+
+    #[derive(cynic::QueryFragment, serde::Serialize, Debug, Clone)]
+    pub struct NakedDeployment {
+        pub id: cynic::Id,
+        pub created_at: DateTime,
+        pub updated_at: DateTime,
+        pub app_version: Option<DeployAppVersion>,
+    }
+
+    #[derive(cynic::QueryFragment, serde::Serialize, Debug, Clone)]
     pub struct AutobuildRepository {
         pub id: cynic::Id,
         pub build_id: Uuid,
@@ -1239,6 +1256,7 @@ mod queries {
         Timeout,
         InternalError,
         Cancelled,
+        Running,
     }
 
     impl StatusEnum {
@@ -1251,6 +1269,7 @@ mod queries {
                 Self::Timeout => "timeout",
                 Self::InternalError => "internal_error",
                 Self::Cancelled => "cancelled",
+                Self::Running => "running",
             }
         }
     }

lib/cli/src/commands/app/deploy.rs

@@ -762,7 +762,7 @@ pub async fn wait_app(
 
                         tracing::debug!(
                             current=%header,
-                            expected=%app.active_version.id.inner(),
+                            expected=%version.id.inner(),
                             "app is not at the right version yet",
                         );
                     }

lib/cli/src/commands/app/info.rs

@@ -23,7 +23,10 @@ impl AsyncCliCommand for CmdAppInfo {
         let (_ident, app) = self.ident.load_app(&client).await?;
 
         let app_url = app.url;
-        let versioned_url = app.active_version.url;
+        let versioned_url = app
+            .active_version
+            .as_ref()
+            .map_or("n/a", |version| &version.url);
         let dashboard_url = app.admin_url;
 
         println!("  App Info  ");

lib/cli/src/commands/app/logs.rs

@@ -90,10 +90,12 @@ impl crate::commands::AsyncCliCommand for CmdAppLogs {
             .from
             .unwrap_or_else(|| OffsetDateTime::now_utc() - time::Duration::minutes(10));
 
+        let version = app.active_version.as_ref().map_or("n/a", |v| &v.version);
+
         tracing::info!(
             app.name=%app.name,
             app.owner=%app.owner.global_name,
-            app.version=app.active_version.version,
+            app.version=version,
             range.start=%from,
             range.end=self.until.map(|ts| ts.to_string()),
             "Fetching logs",

lib/cli/src/commands/app/purge_cache.rs

@@ -1,5 +1,7 @@
 //! Get information about an edge app.
 
+use anyhow::Context;
+
 use super::util::AppIdentOpts;
 use crate::{commands::AsyncCliCommand, config::WasmerEnv, opts::ItemFormatOpts};
 
@@ -29,7 +31,12 @@ impl AsyncCliCommand for CmdAppPurgeCache {
         let client = self.env.client()?;
         let (_ident, app) = self.ident.load_app(&client).await?;
 
-        let version_id = app.active_version.id;
+        let version_id = app
+            .active_version
+            .as_ref()
+            .context("Could not purge cache: app has no active version!")?
+            .id
+            .clone();
 
         let name = format!("{} ({})", app.name, app.owner.global_name);