http://git-wip-us.apache.org/repos/asf/airavata/blob/c1b696ba/thrift-interface-descriptions/airavata-apis/airavata_api.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift index 36b6fda..4992f61 100644 --- a/thrift-interface-descriptions/airavata-apis/airavata_api.thrift +++ b/thrift-interface-descriptions/airavata-apis/airavata_api.thrift @@ -356,30 +356,37 @@ service Airavata { /** * - * Get all Public Keys of the Gateway + * Get all Credential summaries for the Gateway * * @param CredStoreToken * Credential Store Token which you want to find the Public Key for. * + * @param credential_store_data_models.SummaryType + * Summary type : SSH,PASSWD or CERT + * * @param gatewayId * This is the unique identifier of your gateway where the token and public key was generated from. * - * @return publicKey + * @return List of Credential Summary Objects * **/ - list<credential_summary.CredentialSummary> getAllGatewaySSHPubKeysSummary (1: required security_model.AuthzToken authzToken, - 2: required string gatewayId) - throws (1: airavata_errors.InvalidRequestException ire, - 2: airavata_errors.AiravataClientException ace, - 3: airavata_errors.AiravataSystemException ase) + list<credential_store_data_models.CredentialSummary> getAllCredentialSummaryForGateway (1: required security_model.AuthzToken authzToken, + 2: required credential_store_data_models.SummaryType type, + 3: required string gatewayId) + throws (1: airavata_errors.InvalidRequestException ire, + 2: airavata_errors.AiravataClientException ace, + 3: airavata_errors.AiravataSystemException ase) /** * - * Get all Public Key summaries for user in a Gateway + * Get all Credential summaries for user in a Gateway * * @param CredStoreToken * Credential Store Token which you want to find the Public Key for. * + * @param credential_store_data_models.SummaryType + * Summary type : SSH,PASSWD or CERT + * * @param gatewayId * This is the unique identifier of your gateway where the token and public key was generated from. * @@ -389,12 +396,13 @@ service Airavata { * @return CredentialSummary * **/ - list<credential_summary.CredentialSummary> getAllSSHPubKeysSummaryForUserInGateway (1: required security_model.AuthzToken authzToken, - 2: required string gatewayId, - 3: required string userId) - throws (1: airavata_errors.InvalidRequestException ire, - 2: airavata_errors.AiravataClientException ace, - 3: airavata_errors.AiravataSystemException ase) + list<credential_store_data_models.CredentialSummary> getAllCredentialSummaryForUsersInGateway (1: required security_model.AuthzToken authzToken, + 2: required credential_store_data_models.SummaryType type, + 3: required string gatewayId, + 4: required string userId) + throws (1: airavata_errors.InvalidRequestException ire, + 2: airavata_errors.AiravataClientException ace, + 3: airavata_errors.AiravataSystemException ase) map<string, string> getAllGatewayPWDCredentials (1: required security_model.AuthzToken authzToken,
http://git-wip-us.apache.org/repos/asf/airavata/blob/c1b696ba/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift b/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift index 923a192..269ff2c 100644 --- a/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift +++ b/thrift-interface-descriptions/component-cpis/credential-store-cpi.thrift @@ -50,8 +50,10 @@ service CredentialStoreService { credential_store_data_models.SSHCredential getSSHCredential (1: required string tokenId, 2: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); - credential_store_data_models.SSHCredentialSummary getSSHCredentialSummary (1: required string tokenId, 2: required string gatewayId) - throws (1:credential_store_errors.CredentialStoreException csException); + credential_store_data_models.CredentialSummary getCredentialSummary (1: required credential_store_data_models.SummaryType type, + 2: required string tokenId, + 3: required string gatewayId) + throws (1:credential_store_errors.CredentialStoreException csException); credential_store_data_models.CertificateCredential getCertificateCredential (1: required string tokenId, 2: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); @@ -63,9 +65,14 @@ service CredentialStoreService { map<string,string> getAllSSHKeysForGateway (1: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); - list<credential_store_data_models.SSHCredentialSummary> getAllGatewaySSHCredentialSummary (1: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); + list<credential_store_data_models.CredentialSummary> getAllCredentialSummaryForGateway (1: required credential_store_data_models.SummaryType type, + 2: required string gatewayId) + throws (1:credential_store_errors.CredentialStoreException csException); - list<credential_store_data_models.SSHCredentialSummary> getAllSSHCredentialSummaryForUserInGateway (1: required string gatewayId, 2: required string userId) throws (1:credential_store_errors.CredentialStoreException csException); + list<credential_store_data_models.CredentialSummary> getAllCredentialSummaryForUserInGateway (1: required credential_store_data_models.SummaryType type, + 2: required string gatewayId, + 3: required string userId) + throws (1:credential_store_errors.CredentialStoreException csException); map<string,string> getAllPWDCredentialsForGateway (1: required string gatewayId) throws (1:credential_store_errors.CredentialStoreException csException); http://git-wip-us.apache.org/repos/asf/airavata/blob/c1b696ba/thrift-interface-descriptions/data-models/credential-store-models/credential_store_data_models.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/credential-store-models/credential_store_data_models.thrift b/thrift-interface-descriptions/data-models/credential-store-models/credential_store_data_models.thrift index fc59df8..d1aa995 100644 --- a/thrift-interface-descriptions/data-models/credential-store-models/credential_store_data_models.thrift +++ b/thrift-interface-descriptions/data-models/credential-store-models/credential_store_data_models.thrift @@ -41,13 +41,24 @@ struct SSHCredential { 9: optional CredentialOwnerType credentialOwnerType = CredentialOwnerType.GATEWAY } -struct SSHCredentialSummary { - 1: required string gatewayId, - 2: required string username, - 3: optional string publicKey, - 4: optional i64 persistedTime, - 5: required string token, - 6: optional string description +/** + * Data Types supported in Airavata. The primitive data types + * +*/ +enum SummaryType{ + SSH, + PASSWD, + CERT +} + +struct CredentialSummary { + 1: required SummaryType type, + 2: required string gatewayId, + 3: required string username, + 4: optional string publicKey, + 5: optional i64 persistedTime, + 6: required string token, + 7: optional string description } struct CommunityUser { http://git-wip-us.apache.org/repos/asf/airavata/blob/c1b696ba/thrift-interface-descriptions/data-models/resource-catalog-models/credential_summary.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/credential_summary.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/credential_summary.thrift deleted file mode 100644 index c60389a..0000000 --- a/thrift-interface-descriptions/data-models/resource-catalog-models/credential_summary.thrift +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * - */ - -namespace java org.apache.airavata.model.appcatalog.credentialsummary -namespace php Airavata.Model.AppCatalog.CredetialSummary -namespace cpp apache.airavata.model.appcatalog.credentialsummary -namespace py apache.airavata.model.appcatalog.credentialsummary - -struct CredentialSummary { - 1: required string gatewayId, - 2: required string username, - 3: required string token; - 4: optional string publicKey, - 5: optional i64 persistedTime, - 6: optional string description -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/airavata/blob/c1b696ba/thrift-interface-descriptions/data-models/resource-catalog-models/resource_catalog_models.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/resource_catalog_models.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/resource_catalog_models.thrift index 3b144eb..da4a340 100644 --- a/thrift-interface-descriptions/data-models/resource-catalog-models/resource_catalog_models.thrift +++ b/thrift-interface-descriptions/data-models/resource-catalog-models/resource_catalog_models.thrift @@ -21,5 +21,4 @@ include "compute_resource_model.thrift" include "storage_resource_model.thrift" include "gateway_resource_profile_model.thrift" -include "user_resource_profile_model.thrift" -include "credential_summary.thrift" \ No newline at end of file +include "user_resource_profile_model.thrift" \ No newline at end of file
