Merge pull request #299 from GSA/field-name-updates

Field name updates
GSA · Jan 30, 2024 · d78ca59 · d78ca59
2 parents 64dc2d4 + de7b79a
commit d78ca59
Show file tree

Hide file tree

Showing 6 changed files with 157 additions and 192 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -15,32 +15,14 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE,
       # so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: install
         run: npm install
 
       - name: build
         run: npm run build:all
 
-      # - name: deploy api
-      #   uses: 18f/cg-deploy-action@main
-      #   with:
-      #     cf_username: ${{ secrets.CF_USERNAME }}
-      #     cf_password: ${{ secrets.CF_PASSWORD }}
-      #     cf_org: gsatts-sitescan
-      #     cf_space: prod
-      #     push_arguments: '--vars-file vars.yml site-scanner-api'
-
-      # - name: deploy consumer
-      #   uses: 18f/cg-deploy-action@main
-      #   with:
-      #     cf_username: ${{ secrets.CF_USERNAME }}
-      #     cf_password: ${{ secrets.CF_PASSWORD }}
-      #     cf_org: gsatts-sitescan
-      #     cf_space: prod
-      #     push_arguments: '--vars-file vars.yml site-scanner-consumer'
-
       - name: deploy api and consumer
         uses: cloud-gov/cg-cli-tools@main
         with:

diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -20,40 +20,20 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE,
       # so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: install
         run: npm install
 
       - name: build
         run: npm run build:all
 
-      - name: deploy api to dev
-        uses: 18f/cg-deploy-action@main
-        with:
-          cf_username: ${{ secrets.CF_USERNAME }}
-          cf_password: ${{ secrets.CF_PASSWORD }}
-          cf_org: gsatts-sitescan
-          cf_space: dev
-          push_arguments: '--vars-file vars-dev.yml site-scanner-api'
-
-      - name: deploy consumer to dev
-        uses: 18f/cg-deploy-action@main
-        with:
-          cf_username: ${{ secrets.CF_USERNAME }}
-          cf_password: ${{ secrets.CF_PASSWORD }}
-          cf_org: gsatts-sitescan
-          cf_space: dev
-          push_arguments: '--vars-file vars-dev.yml site-scanner-consumer'
-
-      - name: scale consumer
+      - name: deploy api and consumer to dev
         uses: cloud-gov/cg-cli-tools@main
         with:
           cf_api: https://api.fr.cloud.gov
           cf_username: ${{ secrets.CF_USERNAME }}
           cf_password: ${{ secrets.CF_PASSWORD }}
           cf_org: gsatts-sitescan
           cf_space: dev
-          cf_command: 'scale site-scanner-consumer -i 1 -k 4G -m 512M -f'
-          # scale to two instances with 4G scratch disk and 2G
-          # memory each and force deploy
+          cf_command: push -f manifest.yml --vars-file vars-dev.yml
diff --git a/entities/core-result.entity.ts b/entities/core-result.entity.ts
@@ -83,7 +83,7 @@ export class CoreResult {
   finalUrlBaseDomain?: string;
 
   @Column({ nullable: true })
-  @Expose({ name: 'final_url_mimetype' })
+  @Expose({ name: 'final_url_media_type' })
   finalUrlMIMEType?: string;
 
   @Column({ nullable: true })
@@ -147,12 +147,12 @@ export class CoreResult {
   uswdsCount?: number;
 
   @Column({ nullable: true })
-  @Expose({ name: 'dap_detected_final_url' })
+  @Expose({ name: 'dap' })
   dapDetected?: boolean;
 
   // dap_parameters need to be parsed into JSON on serialization.
   @Column({ nullable: true })
-  @Expose({ name: 'dap_parameters_final_url' })
+  @Expose({ name: 'dap_parameters' })
   @Transform(
     (value) => {
       if (value) {
@@ -170,23 +170,23 @@ export class CoreResult {
   dapParameters?: string;
 
   @Column({ nullable: true })
-  @Expose({ name: 'og_title_final_url' })
+  @Expose({ name: 'og_title' })
   ogTitleFinalUrl?: string;
 
   @Column({ nullable: true })
-  @Expose({ name: 'og_description_final_url' })
+  @Expose({ name: 'og_description' })
   ogDescriptionFinalUrl?: string;
 
   @Column({ nullable: true })
-  @Expose({ name: 'og_article_published_final_url' })
+  @Expose({ name: 'og_article_published' })
   ogArticlePublishedFinalUrl?: Date;
 
   @Column({ nullable: true })
-  @Expose({ name: 'og_article_modified_final_url' })
+  @Expose({ name: 'og_article_modified' })
   ogArticleModifiedFinalUrl?: Date;
 
   @Column({ nullable: true })
-  @Expose({ name: 'main_element_present_final_url' })
+  @Expose({ name: 'main_element_present' })
   mainElementFinalUrl?: boolean;
 
   @Column({ nullable: true })
@@ -206,15 +206,15 @@ export class CoreResult {
   robotsTxtDetected?: boolean;
 
   @Column({ nullable: true })
-  @Expose({ name: 'robots_txt_final_url_mimetype' })
+  @Expose({ name: 'robots_txt_final_url_media_type' })
   robotsTxtFinalUrlMimeType?: string;
 
   @Column({ nullable: true })
   @Expose({ name: 'robots_txt_target_url_redirects' })
   robotsTxtTargetUrlRedirects?: boolean;
 
   @Column({ nullable: true })
-  @Expose({ name: 'robots_txt_final_url_filesize_in_bytes' })
+  @Expose({ name: 'robots_txt_final_url_filesize' })
   robotsTxtFinalUrlSize?: number;
 
   @Column({ nullable: true })
@@ -253,11 +253,11 @@ export class CoreResult {
   sitemapTargetUrlRedirects?: boolean;
 
   @Column({ nullable: true })
-  @Expose({ name: 'sitemap_xml_final_url_filesize_in_bytes' })
+  @Expose({ name: 'sitemap_xml_final_url_filesize' })
   sitemapXmlFinalUrlFilesize?: number;
 
   @Column({ nullable: true })
-  @Expose({ name: 'sitemap_xml_final_url_mimetype' })
+  @Expose({ name: 'sitemap_xml_final_url_media_type' })
   sitemapXmlFinalUrlMimeType?: string;
 
   @Column({ nullable: true })
@@ -295,11 +295,11 @@ export class CoreResult {
   cookieDomains?: string;
 
   @Column({ nullable: true })
-  @Expose({ name: 'dns_ipv6' })
+  @Expose({ name: 'ipv6' })
   dnsIpv6?: boolean;
 
   @Column({ nullable: true })
-  @Expose({ name: 'login_detected' })
+  @Expose({ name: 'login' })
   @Transform((value: string) => {
     if (value) {
       return value.split(',');
@@ -310,7 +310,7 @@ export class CoreResult {
   loginDetected?: string;
 
   @Column({ nullable: true })
-  @Expose({ name: 'dns_hostname' })
+  @Expose({ name: 'hostname' })
   dnsHostname?: string;
 
   @Column({ nullable: true })
@@ -360,11 +360,11 @@ export class CoreResult {
   loginProvider?: string;
 
   @Column({ nullable: true })
-  @Expose({ name: 'search_detected' })
+  @Expose({ name: 'site_search' })
   searchDetected?: boolean;
 
   @Column({ nullable: true })
-  @Expose({ name: 'searchgov' })
+  @Expose({ name: 'search_dot_gov' })
   searchgov?: boolean;
 
   @Column({ nullable: true })