Merge pull request #286 from ImMin5/master

Add 'error_message' at JobInfo of identity
cloudforet-io · Mar 28, 2024 · c9ca69a · c9ca69a
2 parents 457ed60 + 4e930a2
commit c9ca69a
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 89 deletions.
diff --git a/proto/spaceone/api/identity/v2/job.proto b/proto/spaceone/api/identity/v2/job.proto
@@ -109,6 +109,7 @@ message JobInfo {
   string job_id = 1;
   Status status = 2;
   ResourceGroup resource_group = 3;
+  string error_message = 4;
 
   string domain_id = 21;
   string workspace_id = 22;

diff --git a/proto/spaceone/api/identity/v2/trusted_account.proto b/proto/spaceone/api/identity/v2/trusted_account.proto
@@ -36,7 +36,7 @@ service TrustedAccount {
       body: "*"
     };
   }
-  rpc sync (TrustedAccountRequest) returns (spaceone.api.identity.v2.JobInfo) {
+  rpc sync (TrustedAccountRequest) returns (JobInfo) {
     option (google.api.http) = {
       post: "/identity/v2/trusted-account/sync"
       body: "*"

diff --git a/proto/spaceone/api/identity/v2/user_profile.proto b/proto/spaceone/api/identity/v2/user_profile.proto
@@ -13,96 +13,96 @@ import "spaceone/api/identity/v2/user.proto";
 
 
 service UserProfile {
-    rpc update (UpdateUserProfileRequest) returns (UserInfo) {
-        option (google.api.http) = {
-            post: "/identity/v2/user-profile/update"
-            body: "*"
-        };
-    }
-
-    rpc verify_email (VerifyEmailRequest) returns (google.protobuf.Empty) {
-        option (google.api.http) = {
-            post: "/identity/v2/user-profile/verify-email"
-            body: "*"
-        };
-    }
-
-    rpc confirm_email (ConfirmEmailRequest) returns (UserInfo) {
-        option (google.api.http) = {
-            post: "/identity/v2/user-profile/confirm-email"
-            body: "*"
-        };
-    }
-
-    // +noauth
-    rpc reset_password (UserPasswordResetRequest) returns (google.protobuf.Empty) {
-        option (google.api.http) = {
-            post: "/identity/v2/user-profile/reset-password"
-            body: "*",
-        };
-    }
-
-    // Enable MFA for user. If this api is called, send email to user.
-    rpc enable_mfa (EnableMFARequest) returns (UserInfo){
-        option (google.api.http) = {
-            post: "/identity/v2/user-profile/enable-mfa"
-            body: "*"
-        };
-    }
-
-    // Disable MFA for user. If this api is called, send email to user.
-    rpc disable_mfa (DisableMFARequest) returns (UserInfo) {
-        option (google.api.http) = {
-            post: "/identity/v2/user-profile/disable-mfa"
-            body: "*"
-        };
-    }
-
-    // Confirm MFA for user by given verify_code which is sent by your authentication method.
-    rpc confirm_mfa (ConfirmMFARequest) returns (UserInfo) {
-        option (google.api.http) = {
-            post: "/identity/v2/user-profile/confirm-mfa"
-            body: "*"
-        };
-    }
-
-    rpc get (UserProfileRequest) returns (UserInfo) {
-        option (google.api.http) = {
-            post: "/identity/v2/user-profile/get"
-            body: "*"
-        };
-    }
-
-    rpc get_workspaces (UserProfileRequest) returns (spaceone.api.identity.v2.WorkspacesInfo) {
-        option (google.api.http) = {
-            post: "/identity/v2/user-profile/get-workspaces"
-            body: "*"
-        };
-    }
+  rpc update (UpdateUserProfileRequest) returns (UserInfo) {
+    option (google.api.http) = {
+      post: "/identity/v2/user-profile/update"
+      body: "*"
+    };
+  }
+
+  rpc verify_email (VerifyEmailRequest) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      post: "/identity/v2/user-profile/verify-email"
+      body: "*"
+    };
+  }
+
+  rpc confirm_email (ConfirmEmailRequest) returns (UserInfo) {
+    option (google.api.http) = {
+      post: "/identity/v2/user-profile/confirm-email"
+      body: "*"
+    };
+  }
+
+  // +noauth
+  rpc reset_password (UserPasswordResetRequest) returns (google.protobuf.Empty) {
+    option (google.api.http) = {
+      post: "/identity/v2/user-profile/reset-password"
+      body: "*",
+    };
+  }
+
+  // Enable MFA for user. If this api is called, send email to user.
+  rpc enable_mfa (EnableMFARequest) returns (UserInfo){
+    option (google.api.http) = {
+      post: "/identity/v2/user-profile/enable-mfa"
+      body: "*"
+    };
+  }
+
+  // Disable MFA for user. If this api is called, send email to user.
+  rpc disable_mfa (DisableMFARequest) returns (UserInfo) {
+    option (google.api.http) = {
+      post: "/identity/v2/user-profile/disable-mfa"
+      body: "*"
+    };
+  }
+
+  // Confirm MFA for user by given verify_code which is sent by your authentication method.
+  rpc confirm_mfa (ConfirmMFARequest) returns (UserInfo) {
+    option (google.api.http) = {
+      post: "/identity/v2/user-profile/confirm-mfa"
+      body: "*"
+    };
+  }
+
+  rpc get (UserProfileRequest) returns (UserInfo) {
+    option (google.api.http) = {
+      post: "/identity/v2/user-profile/get"
+      body: "*"
+    };
+  }
+
+  rpc get_workspaces (UserProfileRequest) returns (WorkspacesInfo) {
+    option (google.api.http) = {
+      post: "/identity/v2/user-profile/get-workspaces"
+      body: "*"
+    };
+  }
 }
 
 message UpdateUserProfileRequest {
-    // +optional
-    string password = 1;
-    // +optional
-    string name = 2;
-    // +optional
-    string email = 3;
-    // +optional
-    string language = 4;
-    // +optional
-    string timezone = 5;
-    // +optional
-    google.protobuf.Struct tags = 6;
+  // +optional
+  string password = 1;
+  // +optional
+  string name = 2;
+  // +optional
+  string email = 3;
+  // +optional
+  string language = 4;
+  // +optional
+  string timezone = 5;
+  // +optional
+  google.protobuf.Struct tags = 6;
 }
 
 message VerifyEmailRequest {
-    // +optional
-    string email = 1;
+  // +optional
+  string email = 1;
 }
 
 message ConfirmEmailRequest {
-    string verify_code = 1;
+  string verify_code = 1;
 }
 
 //{
@@ -112,10 +112,10 @@ message ConfirmEmailRequest {
 //  "domain_id": "domain-a1b2c3d4e5f6"
 //}
 message EnableMFARequest {
-    // EMAIL
-    string mfa_type = 1;
-    // If mfa_type is EMAIL, email is required in options. options will be saved in mfa's options field.
-    google.protobuf.Struct options = 3;
+  // EMAIL
+  string mfa_type = 1;
+  // If mfa_type is EMAIL, email is required in options. options will be saved in mfa's options field.
+  google.protobuf.Struct options = 3;
 }
 
 //{
@@ -132,13 +132,13 @@ message DisableMFARequest {
 //  "domain_id": "domain-a1b2c3d4e5f6"
 //}
 message ConfirmMFARequest {
-    string verify_code = 1;
+  string verify_code = 1;
 }
 
 message UserProfileRequest {
 }
 
 message UserPasswordResetRequest {
-    string user_id = 1;
-    string domain_id = 21;
+  string user_id = 1;
+  string domain_id = 21;
 }