Skip to content

Commit 1908e4e

Browse files
authored
Merge pull request #712 from GSA/updates-fixes
Fixes for new org name and updates
2 parents b3115f7 + 54a65fa commit 1908e4e

11 files changed

Lines changed: 542 additions & 445 deletions

File tree

‎.about.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ project: "api.data.gov"
33
full_name: api.data.gov
44
name: api-data-gov
55
github:
6-
- 18F/api.data.gov
6+
- GSA/api.data.gov
77
- NREL/api-umbrella
88
description: "A hosted, shared-service that provides an API key, analytics, and proxy solution for government web services. We are currently accepting clients for this free service: contact us to learn more."
99
owner_type: project
@@ -52,7 +52,7 @@ team:
5252
licenses:
5353
api.data.gov:
5454
name: Public Domain (CC0)
55-
url: https://github.com/18F/api.data.gov/blob/main/LICENSE.md
55+
url: https://github.com/GSA/api.data.gov/blob/main/LICENSE.md
5656
api-umbrella:
5757
name: MIT
5858
url: https://github.com/NREL/api-umbrella/blob/main/LICENSE.txt

‎.github/workflows/main.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@ on: [push, pull_request]
44

55
env:
66
COMPOSE_FILE: docker-compose.ci.yml
7-
TEST_IMAGE_REPO: ghcr.io/18f/api.data.gov
7+
TEST_IMAGE_REPO: ghcr.io/gsa/api.data.gov
88

99
jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212
outputs:
1313
image-tag: ${{ steps.image-metadata.outputs.version }}
1414
steps:
15-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
1616
with:
1717
submodules: recursive
1818

1919
- name: Container metadata
2020
id: image-metadata
21-
uses: docker/metadata-action@v5
21+
uses: docker/metadata-action@dc802804100637a589fabce1cb79ff13a1411302 # v6.2.0
2222
with:
2323
images: ${{ env.TEST_IMAGE_REPO }}
2424
flavor: |
2525
prefix=test-image-
2626
2727
- name: Login to GitHub Container Registry
28-
uses: docker/login-action@v3
28+
uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
2929
with:
3030
registry: ghcr.io
3131
username: ${{ github.actor }}
@@ -66,12 +66,12 @@ jobs:
6666
- deploy_env: staging
6767
contact_api_key_secret_name: STAGING_CONTACT_API_KEY
6868
steps:
69-
- uses: actions/checkout@v4
69+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
7070
with:
7171
submodules: recursive
7272

7373
- name: Login to GitHub Container Registry
74-
uses: docker/login-action@v3
74+
uses: docker/login-action@abd2ef45e78c5afb21d64d4ca52ee8550d9572c7 # v4.5.1
7575
with:
7676
registry: ghcr.io
7777
username: ${{ github.actor }}
@@ -90,13 +90,13 @@ jobs:
9090
hugo \
9191
--minify \
9292
--baseURL "${{ secrets[matrix.web_site_root_secret_name] }}"
93-
- uses: actions/upload-artifact@v4
93+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
9494
with:
9595
name: build-${{ matrix.deploy_env }}
9696
path: ./public
9797

9898
deploy:
99-
if: success() && github.repository_owner == '18F' && github.ref == 'refs/heads/main'
99+
if: success() && github.repository_owner == 'GSA' && github.ref == 'refs/heads/main'
100100
needs: build
101101
runs-on: ubuntu-latest
102102
container:
@@ -123,7 +123,7 @@ jobs:
123123
aws_default_region_secret_name: STAGING_AWS_DEFAULT_REGION
124124
steps:
125125
# Deploy to S3 bucket.
126-
- uses: actions/download-artifact@v4
126+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
127127
with:
128128
name: build-${{ matrix.deploy_env }}
129129
path: ./public

‎.pinact.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
version: 3
2+
min_age:
3+
value: 7
4+
always: true

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
[![CI](https://github.com/18F/api.data.gov/workflows/CI/badge.svg)](https://github.com/18F/api.data.gov/actions?workflow=CI) [![Code Climate](https://codeclimate.com/github/18F/api.data.gov/badges/gpa.svg)](https://codeclimate.com/github/18F/api.data.gov) [![Known Vulnerabilities](https://snyk.io/test/github/18F/api.data.gov/badge.svg?targetFile=Gemfile.lock)](https://snyk.io/test/github/18F/api.data.gov?targetFile=Gemfile.lock) [![Known Vulnerabilities](https://snyk.io/test/github/18F/api.data.gov/badge.svg?targetFile=requirements.txt)](https://snyk.io/test/github/18F/api.data.gov?targetFile=requirements.txt)
1+
[![CI](https://github.com/GSA/api.data.gov/workflows/CI/badge.svg)](https://github.com/GSA/api.data.gov/actions?workflow=CI) [![Code Climate](https://codeclimate.com/github/GSA/api.data.gov/badges/gpa.svg)](https://codeclimate.com/github/GSA/api.data.gov) [![Known Vulnerabilities](https://snyk.io/test/github/GSA/api.data.gov/badge.svg?targetFile=Gemfile.lock)](https://snyk.io/test/github/GSA/api.data.gov?targetFile=Gemfile.lock) [![Known Vulnerabilities](https://snyk.io/test/github/GSA/api.data.gov/badge.svg?targetFile=requirements.txt)](https://snyk.io/test/github/GSA/api.data.gov?targetFile=requirements.txt)
22

33
# api.data.gov
44

55
[https://api.data.gov](https://api.data.gov/) is a free API management service for federal agencies. Our aim is to make it easier for agencies to release and manage APIs.
66

7-
- [Program Notes for api.data.gov](https://github.com/18F/api.data.gov/wiki/Program-Notes)
7+
- [Program Notes for api.data.gov](https://github.com/GSA/api.data.gov/wiki/Program-Notes)
88
- [GitHub Repository for API Umbrella](https://github.com/NREL/api-umbrella), the underlying technology of `api.data.gov`
99

1010
## Notes
@@ -31,7 +31,7 @@ After you're happy with your changes, commit and submit a pull request.
3131

3232
## Deploy
3333

34-
Changes pushed to `main` should automatically be published to production within a few minutes via the [CI GitHub Action](https://github.com/18F/api.data.gov/actions/workflows/main.yml).
34+
Changes pushed to `main` should automatically be published to production within a few minutes via the [CI GitHub Action](https://github.com/GSA/api.data.gov/actions/workflows/main.yml).
3535

3636
## Public domain
3737

‎config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ disableKinds:
77
- taxonomy
88
- term
99
params:
10-
githubRepoUrl: https://github.com/18F/api.data.gov
10+
githubRepoUrl: https://github.com/GSA/api.data.gov
1111
apiUmbrellaContactApiKey: DEMO_KEY
1212
apiUmbrellaSignupApiKey: DEMO_KEY
1313
csp:

‎content/docs/agency-manual/index.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ You can embed the API key signup form for api.data.gov on your own developer hub
374374
Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline' https://api.data.gov https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/; style-src 'self' https://api.data.gov; img-src 'self' data:; connect-src 'self' https://api.data.gov; frame-src https://www.google.com/recaptcha/ https://recaptcha.google.com/recaptcha/;
375375
```
376376
377-
4. Navigate to the webpage where you placed the snippet. You should see a signup form and be able to signup for an API key completely on your own site. Run into any issues? [File an issue](https://github.com/18F/api.data.gov/issues).
377+
4. Navigate to the webpage where you placed the snippet. You should see a signup form and be able to signup for an API key completely on your own site. Run into any issues? [File an issue](https://github.com/GSA/api.data.gov/issues).
378378
379379
## Linking to your own contact/support address
380380
@@ -439,7 +439,7 @@ Everything you can do within the api.data.gov admin interface is powered by an A
439439

440440
## How to post an alert box on api.data.gov and on the individual documentation pages to notify users of upcoming status changes.
441441

442-
Edit the source of your documentation page (for example, [source/docs/nrel/index.md.erb](https://github.com/18F/api.data.gov/blob/main/source/docs/nrel/index.md.erb)). Add a snippet like this to the top of the page below the front-matter (below the last `---` line):
442+
Edit the source of your documentation page (for example, [source/docs/nrel/index.md.erb](https://github.com/GSA/api.data.gov/blob/main/source/docs/nrel/index.md.erb)). Add a snippet like this to the top of the page below the front-matter (below the last `---` line):
443443

444444
```html
445445
<div class="alert alert-danger">

‎docs/procedures.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ This document is to memorialize internal project procedures. Other agencies or t
44

55
##### api.data.gov
66

7-
The System owner and current project developers need commit rights to api.data.gov project repositories ([here](https://github.com/18F/api.data.gov) and [here](https://github.com/18F/api.data.gov-ops). The system owner (currently Gray Brooks) manages this access, granting access to new project developers when they come onboard and removing access when they leave.
7+
The System owner and current project developers need commit rights to api.data.gov project repositories ([here](https://github.com/GSA/api.data.gov) and [here](https://github.com/GSA/api.data.gov-ops). The system owner (currently Gray Brooks) manages this access, granting access to new project developers when they come onboard and removing access when they leave.
88

99
Specifically, current developers are managed as the `api.data.gov` team in the 18F GitHub organization.
1010

11-
Both of the adding and removing processes should be initiated by creating an issue in the project's [issue tracker](https://github.com/18F/api.data.gov/issues). Any one can create the issue, but the system owner should be the one who addresses and closes it.
11+
Both of the adding and removing processes should be initiated by creating an issue in the project's [issue tracker](https://github.com/GSA/api.data.gov/issues). Any one can create the issue, but the system owner should be the one who addresses and closes it.
1212

1313
These accounts are created for developers that need access to contribute code and deploy apps.
1414

@@ -26,11 +26,11 @@ For the api.data.gov service, we utilize [a public, opensource project](https://
2626

2727
The System owner and current project developers need application admin rights within the [api.data.gov system](https://api.data.gov/admin). The system owner (currently Gray Brooks) manages this access, granting access to new project developers when they come onboard and removing access when they leave.
2828

29-
Both of the adding and removing processes should be initiated by creating an issue in the project's [issue tracker](https://github.com/18F/api.data.gov/issues). Any one can create the issue, but the system owner should be the one who addresses and closes it.
29+
Both of the adding and removing processes should be initiated by creating an issue in the project's [issue tracker](https://github.com/GSA/api.data.gov/issues). Any one can create the issue, but the system owner should be the one who addresses and closes it.
3030

3131
These accounts are created for developers that need access to view system data across all participating APIs and to help set up and manage agency access to the system.
3232

33-
1. Create an issue in the project's [issue tracker](https://github.com/18F/api.data.gov/issues) to track the request.
33+
1. Create an issue in the project's [issue tracker](https://github.com/GSA/api.data.gov/issues) to track the request.
3434
2. The system owner, currently Gray Brooks, should see and respond to it. If there's any urgency, contact him via Slack or Email.
3535
3. The system owner will confirm the GSA identity of the applicant, and signal approval in the ticket.
3636
4. The system owner will then create the api.data.gov admin account for the new member, grant them the appropriate permissions, and close the ticket.
@@ -41,7 +41,7 @@ Agency contacts need api.data.gov accounts in order to view the api key users an
4141

4242
The adding process should be initiated by creating an issue in the project's [ops issue tracker](https://github.com/18f/api.data.gov-ops/issues). Any one can create the issue, but the system owner should be the one who addresses and closes it.
4343

44-
1. Create an issue in the project's [issue tracker](https://github.com/18F/api.data.gov/issues) to track the request.
44+
1. Create an issue in the project's [issue tracker](https://github.com/GSA/api.data.gov/issues) to track the request.
4545
2. The system owner, currently Gray Brooks, should see and respond to it. If there's any urgency, contact him via Slack or Email.
4646
3. The system owner will confirm the agency identity of the applicant, and signal approval in the ticket.
4747
4. The system owner will then create the api.data.gov admin account for the new members, grant them the appropriate permissions, and close the ticket.
@@ -52,11 +52,11 @@ The System owner and current project developers need cloud.gov access to api.dat
5252

5353
Specifically, current developers are [granted](https://cloud.gov/docs/apps/managing-teammates/) OrgManager rights to `gsa-tts-api-data-gov`.
5454

55-
Both of the adding and removing processes should be initiated by creating an issue in the project's [issue tracker](https://github.com/18F/api.data.gov/issues). Any one can create the issue, but the system owner should be the one who addresses and closes it.
55+
Both of the adding and removing processes should be initiated by creating an issue in the project's [issue tracker](https://github.com/GSA/api.data.gov/issues). Any one can create the issue, but the system owner should be the one who addresses and closes it.
5656

5757
These accounts are created for developers that need access to contribute code and debug apps.
5858

59-
1. Create an issue in the project's [issue tracker](https://github.com/18F/api.data.gov/issues) to track the request.
59+
1. Create an issue in the project's [issue tracker](https://github.com/GSA/api.data.gov/issues) to track the request.
6060

6161
1. [Create an account]() with cloud.gov and this will include multi factor authentication with [Google authenticator](https://support.google.com/accounts/answer/1066447?hl=en) or [authy](https://www.authy.com/).
6262

@@ -72,11 +72,11 @@ The System owner and current project developers need cloud.gov access to api.dat
7272

7373
Specifically, current developers are [granted](http://docs.aws.amazon.com/IAM/latest/UserGuide/id_users.html) `Developer` rights to the `apidatagov` AWS account.
7474

75-
Both of the adding and removing processes should be initiated by creating an issue in the project's [issue tracker](https://github.com/18F/api.data.gov/issues). Any one can create the issue, but the system owner should be the one who addresses and closes it.
75+
Both of the adding and removing processes should be initiated by creating an issue in the project's [issue tracker](https://github.com/GSA/api.data.gov/issues). Any one can create the issue, but the system owner should be the one who addresses and closes it.
7676

7777
These accounts are created for developers that need access to contribute code and debug apps.
7878

79-
1. Create an issue in the project's [issue tracker](https://github.com/18F/api.data.gov/issues) to track the request.
79+
1. Create an issue in the project's [issue tracker](https://github.com/GSA/api.data.gov/issues) to track the request.
8080

8181
2. The system owner will confirm the GSA identity of the applicant and comment on the ticket to show approval.
8282

@@ -98,7 +98,7 @@ The development team checks for security events weekly. Any unusual or suspiciou
9898

9999
Checklist:
100100

101-
1. Create an issue in the project's [issue tracker](https://github.com/18F/api.data.gov/issues) to track this Security Event Review.
101+
1. Create an issue in the project's [issue tracker](https://github.com/GSA/api.data.gov/issues) to track this Security Event Review.
102102
2. Review tool for all repositories and open a ticket for all "red" alerts.
103103
3. Review [production logs](https://logs.fr.cloud.gov) for unapproved and unusual activities.
104104
4. Review actionable security events on production logs for successful and unsuccessful account logon events, account management events, object access, policy change, privilege functions, process tracking, system events, all administrator activity, authentication checks, authorization checks, data deletions, data access, data changes, and permission changes.

‎package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@
1212
"@uswds/uswds": "^3.13.0",
1313
"a11y-dialog": "^8.1.5",
1414
"bootstrap": "^5.3.8",
15-
"datatables.net-dt": "^2.3.7",
15+
"datatables.net-dt": "^2.3.8",
1616
"echarts": "^6.1.0",
1717
"escape-html": "^1.0.3",
1818
"form-serialize": "^0.7.2",
1919
"ky": "^1.14.3",
2020
"lodash-es": "^4.18.1",
2121
"pinia": "^3.0.4",
22-
"vue": "^3.5.31",
23-
"vue-router": "^5.0.4"
22+
"vue": "^3.5.40",
23+
"vue-router": "^5.2.0"
2424
},
2525
"devDependencies": {
26-
"@eslint/compat": "^2.0.3",
26+
"@eslint/compat": "^2.1.0",
2727
"@eslint/js": "^10.0.1",
28-
"autoprefixer": "^10.4.27",
29-
"eslint": "^10.1.0",
28+
"autoprefixer": "^10.5.4",
29+
"eslint": "^10.7.0",
3030
"eslint-config-prettier": "^10.1.8",
3131
"eslint-plugin-simple-import-sort": "^12.1.1",
32-
"eslint-plugin-vue": "^10.8.0",
33-
"globals": "^17.4.0",
34-
"postcss": "^8.5.18",
32+
"eslint-plugin-vue": "^10.10.0",
33+
"globals": "^17.7.0",
34+
"postcss": "^8.5.23",
3535
"postcss-cli": "^11.0.1",
36-
"postcss-prefixwrap": "^1.57.2",
36+
"postcss-prefixwrap": "^1.58.0",
3737
"postcss-relative-rem": "^1.0.0",
38-
"prettier": "^3.8.1",
38+
"prettier": "^3.9.6",
3939
"prettier-plugin-go-template": "^0.0.15",
40-
"vue-eslint-parser": "^10.4.0"
40+
"vue-eslint-parser": "^10.4.1"
4141
}
4242
}

0 commit comments

Comments
 (0)