Merge pull request #49 from tiki/release/2.1

Release/1.1
tiki-deprecated · Apr 29, 2023 · 60757f8 · 60757f8
2 parents 7251fa1 + fff385c
commit 60757f8
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -155,7 +155,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: OpenApi
-        uses: readmeio/rdme@8.6.0
+        uses: readmeio/rdme@8.6.2
         with:
           rdme: openapi openapi.yaml --key=${{ secrets.README_API_KEY }} --id=640d82621da6200026e803f0
 

diff --git a/openapi.yaml b/openapi.yaml
@@ -5,7 +5,7 @@ info:
   license:
     name: MIT
     url: https://github.com/tiki/l0-registry/blob/main/LICENSE
-  version: 1.0.2
+  version: 1.1.0
 servers:
 - url: https://registry.l0.mytiki.com
 paths:
@@ -67,6 +67,38 @@ paths:
       - oauth:
         - registry:admin
         - registry
+  /api/latest/usage:
+    get:
+      tags:
+      - ""
+      summary: Get Usage
+      description: Get an account's monthly usage
+      operationId: l0-registry-usage-get
+      parameters:
+      - name: month
+        in: query
+        required: false
+        schema:
+          type: integer
+          format: int32
+      - name: year
+        in: query
+        required: false
+        schema:
+          type: integer
+          format: int32
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/UsageAO'
+      security:
+      - oauth:
+        - registry:admin
   /api/latest/id/{id}/pubkey:
     get:
       tags:
@@ -141,7 +173,6 @@ paths:
       security:
       - oauth:
         - registry:admin
-        - registry
   /api/latest/id/{id}:
     delete:
       tags:
@@ -161,7 +192,6 @@ paths:
       security:
       - oauth:
         - registry:admin
-        - registry
 components:
   schemas:
     IdAOReq:
@@ -207,6 +237,24 @@ components:
         modified:
           type: string
           format: date-time
+    UsageAO:
+      type: object
+      properties:
+        date:
+          type: string
+          format: date-time
+        apps:
+          type: array
+          items:
+            $ref: '#/components/schemas/UsageAOApp'
+    UsageAOApp:
+      type: object
+      properties:
+        appId:
+          type: string
+        total:
+          type: integer
+          format: int64
     IdAORspKey:
       type: object
       properties:

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>com.mytiki</groupId>
     <artifactId>l0_registry</artifactId>
-    <version>1.0.2</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
 
     <name>L0 Registry</name>
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.5</version>
+        <version>3.0.6</version>
     </parent>
 
     <properties>
@@ -72,12 +72,12 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
-            <version>2.0.4</version>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-common</artifactId>
-            <version>2.0.4</version>
+            <version>2.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.openapitools</groupId>