enable docker push commands

WIFI-1669 TIP 1.0 Update default container image tags in rel 1.0

.github/workflows/dockerpublish.yml

@@ -5,6 +5,7 @@ on:
     # Publish `master` as Docker `latest` image.
     branches:
       - master
+      - 'release/**'
 
     # Publish `v1.2.3` tags as releases.
     tags:
@@ -13,6 +14,10 @@ on:
   # Run tests for any PRs.
   pull_request:
 
+  schedule:
+      # runs nightly build at 5AM
+      - cron:  '00 09 * * *'
+
 env:
   IMAGE_NAME: wlan-cloud-graphql-gw
   DOCKER_REPO: tip-tip-wlan-cloud-docker-repo.jfrog.io
@@ -39,13 +44,32 @@ jobs:
     needs: test
 
     runs-on: ubuntu-latest
-    if: github.event_name == 'push'
+    if: github.event_name == 'push' || github.event_name == 'schedule'
 
     steps:
       - uses: actions/checkout@v2
         with:
           ssh-key: ${{ secrets.GH_AUTOMATION_KEY }}
+    
+      - name: Adding property file with component version and commit hash 
+        run: |
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+          
+          # Strip "v" prefix from tag name
+          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+          
+          # Create a release snapshot if we are on release branch
+          [[ "${{ github.ref }}" == "refs/heads/release/"* ]] && VERSION=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\/release\/[v]//' | awk '{print $1"-SNAPSHOT"}')
 
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "master" ] && VERSION=1.0.0-SNAPSHOT
+          
+          TIMESTAMP=$(date +'%Y-%m-%d')
+          echo date=$TIMESTAMP > commit.properties
+          echo commitId=$GITHUB_SHA >> commit.properties
+          echo projectVersion=$VERSION>> commit.properties
+          
       - name: Build image
         run: docker build . --file Dockerfile --tag image
         
@@ -58,7 +82,8 @@ jobs:
       - name: Push image
         run: |
           IMAGE_ID=$DOCKER_REPO/$IMAGE_NAME
-          
+          TIMESTAMP=$(date +'%Y-%m-%d')
+                    
           # Change all uppercase to lowercase
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
 
@@ -68,11 +93,18 @@ jobs:
           # Strip "v" prefix from tag name
           [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
 
+          # Create a release snapshot if we are on release branch
+          [[ "${{ github.ref }}" == "refs/heads/release/"* ]] && VERSION=$(echo "${{ github.ref }}" | sed -e 's/refs\/heads\/release\/[v]//' | awk '{print $1"-SNAPSHOT"}')
+
           # Use Docker `latest` tag convention
-          [ "$VERSION" == "master" ] && VERSION=latest
+          [ "$VERSION" == "master" ] && VERSION=1.0.0-SNAPSHOT
 
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
+          echo TIMESTAMP=$TIMESTAMP          
 
           docker tag image $IMAGE_ID:$VERSION
           docker push $IMAGE_ID:$VERSION
+          
+          docker tag image $IMAGE_ID:$VERSION-$TIMESTAMP
+          docker push $IMAGE_ID:$VERSION-$TIMESTAMP

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wlan-cloud-graphql-apollo",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "description": "",
   "main": "index.js",
   "dependencies": {

src/datasource.js

@@ -224,17 +224,11 @@ export class API extends RESTDataSource {
     });
   }
   async getAllProfiles({ customerId, cursor, limit, type, context }) {
-    const result = await this.get('portal/profile/forCustomer', {
+    return this.get('portal/profile/forCustomer', {
       customerId,
+      ...(type && { profileType: type }),
       paginationContext: buildPaginationContext(cursor, limit, context),
     });
-
-    if (type && result.items) {
-      result.items = result.items.filter((i) => i.profileType === type);
-      return result;
-    }
-
-    return result;
   }
   async getProfilesById(profileIdSet) {
     return this.get('portal/profile/inSet', {

src/resolvers.js

@@ -168,19 +168,19 @@ const resolvers = {
       return dataSources.api.updateToken(refreshToken);
     },
 
-    createUser: async (_, { username, password, role, customerId }, { dataSources }) => {
-      return dataSources.api.createUser({ username, password, role, customerId });
+    createUser: async (_, { username, password, roles, customerId }, { dataSources }) => {
+      return dataSources.api.createUser({ username, password, roles, customerId });
     },
     updateUser: async (
       _,
-      { id, username, password, role, customerId, lastModifiedTimestamp },
+      { id, username, password, roles, customerId, lastModifiedTimestamp },
       { dataSources }
     ) => {
       return dataSources.api.updateUser({
         id,
         username,
         password,
-        role,
+        roles,
         customerId,
         lastModifiedTimestamp,
       });
@@ -238,6 +238,7 @@ const resolvers = {
         profileId,
         locationId,
         name,
+        baseMacAddress,
         latitude,
         longitude,
         serial,
@@ -254,6 +255,7 @@ const resolvers = {
         profileId,
         locationId,
         name,
+        baseMacAddress: { addressAsString: baseMacAddress },
         latitude,
         longitude,
         serial,
@@ -378,6 +380,16 @@ const resolvers = {
     },
   },
   Equipment: {
+    baseMacAddress: ({ baseMacAddress }) => baseMacAddress && baseMacAddress.addressAsString,
+    manufacturer: ({ baseMacAddress }, args, { dataSources }) => {
+      return (
+        baseMacAddress &&
+        baseMacAddress.addressAsString &&
+        dataSources.api.getOuiLookup(
+          baseMacAddress.addressAsString.replace(/[:-]/g, '').substring(0, 6)
+        )
+      );
+    },
     profile: ({ profileId }, args, { dataSources }) => {
       return dataSources.api.getProfile(profileId);
     },
@@ -450,7 +462,7 @@ const resolvers = {
         reportedMacAddr &&
         reportedMacAddr.addressAsString &&
         dataSources.api.getOuiLookup(
-          reportedMacAddr.addressAsString.replace(/:/g, '').substring(0, 6)
+          reportedMacAddr.addressAsString.replace(/[:-]/g, '').substring(0, 6)
         )
       );
     },
@@ -514,7 +526,9 @@ const resolvers = {
       return (
         macAddress &&
         macAddress.addressAsString &&
-        dataSources.api.getOuiLookup(macAddress.addressAsString.replace(/:/g, '').substring(0, 6))
+        dataSources.api.getOuiLookup(
+          macAddress.addressAsString.replace(/[:-]/g, '').substring(0, 6)
+        )
       );
     },
     equipment: ({ equipmentId }, args, { dataSources }) => {

src/schema.js

@@ -116,7 +116,7 @@ const typeDefs = gql`
     id: ID!
     username: String!
     password: String
-    role: String!
+    roles: [String]
     customerId: ID!
     lastModifiedTimestamp: String
   }
@@ -159,6 +159,8 @@ const typeDefs = gql`
     profileId: ID!
     locationId: ID!
     name: String!
+    baseMacAddress: String
+    manufacturer: String
     latitude: String
     longitude: String
     serial: String
@@ -350,12 +352,12 @@ const typeDefs = gql`
     authenticateUser(email: String!, password: String!): Token
     updateToken(refreshToken: String!): Token
 
-    createUser(username: String!, password: String!, role: String!, customerId: ID!): User
+    createUser(username: String!, password: String!, roles: [String], customerId: ID!): User
     updateUser(
       id: ID!
       username: String!
       password: String!
-      role: String!
+      roles: [String]
       customerId: ID!
       lastModifiedTimestamp: String
     ): User
@@ -397,6 +399,7 @@ const typeDefs = gql`
       profileId: ID!
       locationId: ID!
       name: String!
+      baseMacAddress: String
       latitude: String
       longitude: String
       serial: String