gs2 1.0.1 → 1.0.4

package/src/version/model/AcceptVersion.ts

@@ -16,6 +16,7 @@ permissions and limitations under the License.
 
 import IModel from '../../core/interface/IModel';
 import Version from './Version';
+const grnFormat: string = "grn:gs2:{region}:{ownerId}:version:{namespaceName}:user:{userId}:version:{versionName}:accept";
 
 export default class AcceptVersion implements IModel {
     private acceptVersionId: string|null = null;
@@ -25,6 +26,125 @@ export default class AcceptVersion implements IModel {
     private createdAt: number|null = null;
     private updatedAt: number|null = null;
 
+    public static getRegion(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '(.*)')
+            .replace('{ownerId}', '.*')
+            .replace('{namespaceName}', '.*')
+            .replace('{userId}', '.*')
+            .replace('{versionName}', '.*')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static getOwnerId(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '.*')
+            .replace('{ownerId}', '(.*)')
+            .replace('{namespaceName}', '.*')
+            .replace('{userId}', '.*')
+            .replace('{versionName}', '.*')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static getNamespaceName(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '.*')
+            .replace('{ownerId}', '.*')
+            .replace('{namespaceName}', '(.*)')
+            .replace('{userId}', '.*')
+            .replace('{versionName}', '.*')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static getUserId(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '.*')
+            .replace('{ownerId}', '.*')
+            .replace('{namespaceName}', '.*')
+            .replace('{userId}', '(.*)')
+            .replace('{versionName}', '.*')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static getVersionName(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '.*')
+            .replace('{ownerId}', '.*')
+            .replace('{namespaceName}', '.*')
+            .replace('{userId}', '.*')
+            .replace('{versionName}', '(.*)')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static isValid(grn: string): boolean {
+        if (this.getRegion(grn) == null) {
+            return false;
+        }
+        if (this.getOwnerId(grn) == null) {
+            return false;
+        }
+        if (this.getNamespaceName(grn) == null) {
+            return false;
+        }
+        if (this.getUserId(grn) == null) {
+            return false;
+        }
+        if (this.getVersionName(grn) == null) {
+            return false;
+        }
+        return true;
+    }
+
+    public static createGrn(
+        region: string|null,
+        ownerId: string|null,
+        namespaceName: string|null,
+        userId: string|null,
+        versionName: string|null,
+    ): string|null {
+        if (region == null || region === '') {
+            return null;
+        }
+        if (ownerId == null || ownerId === '') {
+            return null;
+        }
+        if (namespaceName == null || namespaceName === '') {
+            return null;
+        }
+        if (userId == null || userId === '') {
+            return null;
+        }
+        if (versionName == null || versionName === '') {
+            return null;
+        }
+        return grnFormat
+            .replace('{region}', region!)
+            .replace('{ownerId}', ownerId!)
+            .replace('{namespaceName}', namespaceName!)
+            .replace('{userId}', userId!)
+            .replace('{versionName}', versionName!);
+    }
+
     public getAcceptVersionId(): string|null {
         return this.acceptVersionId;
     }

package/src/version/model/CurrentVersionMaster.ts

@@ -15,11 +15,81 @@ permissions and limitations under the License.
  */
 
 import IModel from '../../core/interface/IModel';
+const grnFormat: string = "grn:gs2:{region}:{ownerId}:version:{namespaceName}";
 
 export default class CurrentVersionMaster implements IModel {
     private namespaceId: string|null = null;
     private settings: string|null = null;
 
+    public static getRegion(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '(.*)')
+            .replace('{ownerId}', '.*')
+            .replace('{namespaceName}', '.*')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static getOwnerId(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '.*')
+            .replace('{ownerId}', '(.*)')
+            .replace('{namespaceName}', '.*')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static getNamespaceName(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '.*')
+            .replace('{ownerId}', '.*')
+            .replace('{namespaceName}', '(.*)')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static isValid(grn: string): boolean {
+        if (this.getRegion(grn) == null) {
+            return false;
+        }
+        if (this.getOwnerId(grn) == null) {
+            return false;
+        }
+        if (this.getNamespaceName(grn) == null) {
+            return false;
+        }
+        return true;
+    }
+
+    public static createGrn(
+        region: string|null,
+        ownerId: string|null,
+        namespaceName: string|null,
+    ): string|null {
+        if (region == null || region === '') {
+            return null;
+        }
+        if (ownerId == null || ownerId === '') {
+            return null;
+        }
+        if (namespaceName == null || namespaceName === '') {
+            return null;
+        }
+        return grnFormat
+            .replace('{region}', region!)
+            .replace('{ownerId}', ownerId!)
+            .replace('{namespaceName}', namespaceName!);
+    }
+
     public getNamespaceId(): string|null {
         return this.namespaceId;
     }

package/src/version/model/Namespace.ts

@@ -17,6 +17,7 @@ permissions and limitations under the License.
 import IModel from '../../core/interface/IModel';
 import ScriptSetting from './ScriptSetting';
 import LogSetting from './LogSetting';
+const grnFormat: string = "grn:gs2:{region}:{ownerId}:version:{namespaceName}";
 
 export default class Namespace implements IModel {
     private namespaceId: string|null = null;
@@ -29,6 +30,75 @@ export default class Namespace implements IModel {
     private createdAt: number|null = null;
     private updatedAt: number|null = null;
 
+    public static getRegion(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '(.*)')
+            .replace('{ownerId}', '.*')
+            .replace('{namespaceName}', '.*')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static getOwnerId(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '.*')
+            .replace('{ownerId}', '(.*)')
+            .replace('{namespaceName}', '.*')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static getNamespaceName(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '.*')
+            .replace('{ownerId}', '.*')
+            .replace('{namespaceName}', '(.*)')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static isValid(grn: string): boolean {
+        if (this.getRegion(grn) == null) {
+            return false;
+        }
+        if (this.getOwnerId(grn) == null) {
+            return false;
+        }
+        if (this.getNamespaceName(grn) == null) {
+            return false;
+        }
+        return true;
+    }
+
+    public static createGrn(
+        region: string|null,
+        ownerId: string|null,
+        namespaceName: string|null,
+    ): string|null {
+        if (region == null || region === '') {
+            return null;
+        }
+        if (ownerId == null || ownerId === '') {
+            return null;
+        }
+        if (namespaceName == null || namespaceName === '') {
+            return null;
+        }
+        return grnFormat
+            .replace('{region}', region!)
+            .replace('{ownerId}', ownerId!)
+            .replace('{namespaceName}', namespaceName!);
+    }
+
     public getNamespaceId(): string|null {
         return this.namespaceId;
     }

package/src/version/model/VersionModel.ts

@@ -16,6 +16,7 @@ permissions and limitations under the License.
 
 import IModel from '../../core/interface/IModel';
 import Version from './Version';
+const grnFormat: string = "grn:gs2:{region}:{ownerId}:version:{namespaceName}:model:version:{versionName}";
 
 export default class VersionModel implements IModel {
     private versionModelId: string|null = null;
@@ -28,6 +29,99 @@ export default class VersionModel implements IModel {
     private needSignature: boolean|null = null;
     private signatureKeyId: string|null = null;
 
+    public static getRegion(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '(.*)')
+            .replace('{ownerId}', '.*')
+            .replace('{namespaceName}', '.*')
+            .replace('{versionName}', '.*')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static getOwnerId(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '.*')
+            .replace('{ownerId}', '(.*)')
+            .replace('{namespaceName}', '.*')
+            .replace('{versionName}', '.*')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static getNamespaceName(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '.*')
+            .replace('{ownerId}', '.*')
+            .replace('{namespaceName}', '(.*)')
+            .replace('{versionName}', '.*')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static getVersionName(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '.*')
+            .replace('{ownerId}', '.*')
+            .replace('{namespaceName}', '.*')
+            .replace('{versionName}', '(.*)')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static isValid(grn: string): boolean {
+        if (this.getRegion(grn) == null) {
+            return false;
+        }
+        if (this.getOwnerId(grn) == null) {
+            return false;
+        }
+        if (this.getNamespaceName(grn) == null) {
+            return false;
+        }
+        if (this.getVersionName(grn) == null) {
+            return false;
+        }
+        return true;
+    }
+
+    public static createGrn(
+        region: string|null,
+        ownerId: string|null,
+        namespaceName: string|null,
+        versionName: string|null,
+    ): string|null {
+        if (region == null || region === '') {
+            return null;
+        }
+        if (ownerId == null || ownerId === '') {
+            return null;
+        }
+        if (namespaceName == null || namespaceName === '') {
+            return null;
+        }
+        if (versionName == null || versionName === '') {
+            return null;
+        }
+        return grnFormat
+            .replace('{region}', region!)
+            .replace('{ownerId}', ownerId!)
+            .replace('{namespaceName}', namespaceName!)
+            .replace('{versionName}', versionName!);
+    }
+
     public getVersionModelId(): string|null {
         return this.versionModelId;
     }

package/src/version/model/VersionModelMaster.ts

@@ -16,6 +16,7 @@ permissions and limitations under the License.
 
 import IModel from '../../core/interface/IModel';
 import Version from './Version';
+const grnFormat: string = "grn:gs2:{region}:{ownerId}:version:{namespaceName}:model:version:{versionName}";
 
 export default class VersionModelMaster implements IModel {
     private versionModelId: string|null = null;
@@ -31,6 +32,99 @@ export default class VersionModelMaster implements IModel {
     private createdAt: number|null = null;
     private updatedAt: number|null = null;
 
+    public static getRegion(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '(.*)')
+            .replace('{ownerId}', '.*')
+            .replace('{namespaceName}', '.*')
+            .replace('{versionName}', '.*')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static getOwnerId(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '.*')
+            .replace('{ownerId}', '(.*)')
+            .replace('{namespaceName}', '.*')
+            .replace('{versionName}', '.*')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static getNamespaceName(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '.*')
+            .replace('{ownerId}', '.*')
+            .replace('{namespaceName}', '(.*)')
+            .replace('{versionName}', '.*')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static getVersionName(grn: string): string|null {
+        const match = grn.match(grnFormat
+            .replace('{region}', '.*')
+            .replace('{ownerId}', '.*')
+            .replace('{namespaceName}', '.*')
+            .replace('{versionName}', '(.*)')
+        );
+        if (match) {
+            return match[1];
+        }
+        return null;
+    }
+
+    public static isValid(grn: string): boolean {
+        if (this.getRegion(grn) == null) {
+            return false;
+        }
+        if (this.getOwnerId(grn) == null) {
+            return false;
+        }
+        if (this.getNamespaceName(grn) == null) {
+            return false;
+        }
+        if (this.getVersionName(grn) == null) {
+            return false;
+        }
+        return true;
+    }
+
+    public static createGrn(
+        region: string|null,
+        ownerId: string|null,
+        namespaceName: string|null,
+        versionName: string|null,
+    ): string|null {
+        if (region == null || region === '') {
+            return null;
+        }
+        if (ownerId == null || ownerId === '') {
+            return null;
+        }
+        if (namespaceName == null || namespaceName === '') {
+            return null;
+        }
+        if (versionName == null || versionName === '') {
+            return null;
+        }
+        return grnFormat
+            .replace('{region}', region!)
+            .replace('{ownerId}', ownerId!)
+            .replace('{namespaceName}', namespaceName!)
+            .replace('{versionName}', versionName!);
+    }
+
     public getVersionModelId(): string|null {
         return this.versionModelId;
     }

package/src/watch/index.ts

@@ -14,7 +14,14 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-export * as Model from './model';
-export * as Request from './request';
-export * as Result from './result';
-export { Gs2WatchRestClient } from './rest';
+import * as model from './model';
+import * as request from './request';
+import * as result from './result';
+import Gs2WatchRestClient from './rest';
+
+export {
+    model,
+    request,
+    result,
+    Gs2WatchRestClient,
+}

package/src/watch/model/BillingActivity.ts

@@ -14,9 +14,9 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IModel from '@/gs2/core/interface/IModel';
+import IModel from '../../core/interface/IModel';
 
-export class BillingActivity implements IModel {
+export default class BillingActivity implements IModel {
     private billingActivityId: string|null = null;
     private year: number|null = null;
     private month: number|null = null;

package/src/watch/model/Chart.ts

@@ -14,9 +14,9 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IModel from '@/gs2/core/interface/IModel';
+import IModel from '../../core/interface/IModel';
 
-export class Chart implements IModel {
+export default class Chart implements IModel {
     private chartId: string|null = null;
     private embedId: string|null = null;
     private html: string|null = null;

package/src/watch/model/Cumulative.ts

@@ -14,9 +14,9 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IModel from '@/gs2/core/interface/IModel';
+import IModel from '../../core/interface/IModel';
 
-export class Cumulative implements IModel {
+export default class Cumulative implements IModel {
     private cumulativeId: string|null = null;
     private resourceGrn: string|null = null;
     private name: string|null = null;

package/src/watch/model/index.ts

@@ -13,6 +13,12 @@ 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.
  */
-export { Chart } from "./Chart"
-export { Cumulative } from "./Cumulative"
-export { BillingActivity } from "./BillingActivity"
+import Chart from "./Chart"
+import Cumulative from "./Cumulative"
+import BillingActivity from "./BillingActivity"
+
+export {
+    Chart,
+    Cumulative,
+    BillingActivity,
+};

package/src/watch/request/DescribeBillingActivitiesRequest.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IRequest from '@/gs2/core/interface/IRequest';
+import IRequest from '../../core/interface/IRequest';
 
 import * as Gs2Watch from '../model'
 
-export class DescribeBillingActivitiesRequest implements IRequest {
+export default class DescribeBillingActivitiesRequest implements IRequest {
 
     private requestId: string|null = null;
     private contextStack: string|null = null;

package/src/watch/request/GetBillingActivityRequest.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IRequest from '@/gs2/core/interface/IRequest';
+import IRequest from '../../core/interface/IRequest';
 
 import * as Gs2Watch from '../model'
 
-export class GetBillingActivityRequest implements IRequest {
+export default class GetBillingActivityRequest implements IRequest {
 
     private requestId: string|null = null;
     private contextStack: string|null = null;

package/src/watch/request/GetChartRequest.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IRequest from '@/gs2/core/interface/IRequest';
+import IRequest from '../../core/interface/IRequest';
 
 import * as Gs2Watch from '../model'
 
-export class GetChartRequest implements IRequest {
+export default class GetChartRequest implements IRequest {
 
     private requestId: string|null = null;
     private contextStack: string|null = null;

package/src/watch/request/GetCumulativeRequest.ts

@@ -14,11 +14,11 @@ express or implied. See the License for the specific language governing
 permissions and limitations under the License.
  */
 
-import IRequest from '@/gs2/core/interface/IRequest';
+import IRequest from '../../core/interface/IRequest';
 
 import * as Gs2Watch from '../model'
 
-export class GetCumulativeRequest implements IRequest {
+export default class GetCumulativeRequest implements IRequest {
 
     private requestId: string|null = null;
     private contextStack: string|null = null;

package/src/watch/request/index.ts

@@ -13,7 +13,14 @@ 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.
  */
-export { GetChartRequest } from "./GetChartRequest"
-export { GetCumulativeRequest } from "./GetCumulativeRequest"
-export { DescribeBillingActivitiesRequest } from "./DescribeBillingActivitiesRequest"
-export { GetBillingActivityRequest } from "./GetBillingActivityRequest"
+import GetChartRequest from "./GetChartRequest"
+import GetCumulativeRequest from "./GetCumulativeRequest"
+import DescribeBillingActivitiesRequest from "./DescribeBillingActivitiesRequest"
+import GetBillingActivityRequest from "./GetBillingActivityRequest"
+
+export {
+    GetChartRequest,
+    GetCumulativeRequest,
+    DescribeBillingActivitiesRequest,
+    GetBillingActivityRequest,
+};