Skip to content

Commit

Permalink
feat!: migrates to farmos3 and postgres 13 (#21)
Browse files Browse the repository at this point in the history
Migrates the base and sample databases to farmOS v3.x and postgres v13.
These sample databases are not compatible with farmOS v2.x and the v2.x
databases are not compatible with farmOS v3.x and postgres v13.

If using the farmOS v3.x images then a release of the sample databases
>= 2.0.0 is required.
  • Loading branch information
braughtg authored Dec 12, 2023
1 parent e9ba24e commit dc606e8
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 7 deletions.
Binary file modified dist/db.base.tar.gz
Binary file not shown.
Binary file modified dist/db.sample.tar.gz
Binary file not shown.
12 changes: 6 additions & 6 deletions src/sampleDB/addConsumerCORSOrigins.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,41 +2,41 @@ describe("Add CORS origins to the farm consumer", () => {
it("Add CORS origins", () => {
cy.login("admin", "admin");
cy.visit(
"admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
"admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
);
cy.get("#edit-allowed-origins-0-value").clear();
cy.get("#edit-allowed-origins-0-value").type("http://localhost:5173");
cy.get("#edit-submit").click();
cy.visit(
"admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
"admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
);

cy.get("#edit-allowed-origins-1-value").clear();
cy.get("#edit-allowed-origins-1-value").type("http://localhost:5174");
cy.get("#edit-submit").click();
cy.visit(
"admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
"admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
);

cy.get("#edit-allowed-origins-2-value").clear();
cy.get("#edit-allowed-origins-2-value").type("http://localhost:5175");
cy.get("#edit-submit").click();
cy.visit(
"admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
"admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
);

cy.get("#edit-allowed-origins-3-value").clear();
cy.get("#edit-allowed-origins-3-value").type("http://localhost:4173");
cy.get("#edit-submit").click();
cy.visit(
"admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
"admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
);

cy.get("#edit-allowed-origins-4-value").clear();
cy.get("#edit-allowed-origins-4-value").type("http://localhost:4174");
cy.get("#edit-submit").click();
cy.visit(
"admin/config/services/consumer/2/edit?destination=/admin/config/services/consumer"
"admin/config/services/consumer/34/edit?destination=/admin/config/services/consumer"
);

cy.get("#edit-allowed-origins-5-value").clear();
Expand Down
12 changes: 11 additions & 1 deletion src/sampleDB/buildSampleDB.bash
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ echo ""
error_check
echo ""

# Enable the FarmData2 modules in farmos
# Enable the farmOS modules needed for FarmData2, including
# the FarmData2 modules themselves.
"$SCRIPT_DIR/enableFarmData2Modules.bash"
error_check
echo ""
Expand All @@ -39,6 +40,15 @@ error_check
safe_cd "$CUR_DIR"
echo "Added."

# Generate the API keys
echo "Generating API keys..."
CUR_DIR=$(pwd)
safe_cd "$REPO_DIR"
npx cypress run --spec=src/sampleDB/generateAPIKeys.cy.js
error_check
safe_cd "$CUR_DIR"
echo "Generated."

# Add the users and assign their roles
"$SCRIPT_DIR/addUsers.bash"
error_check
Expand Down
10 changes: 10 additions & 0 deletions src/sampleDB/enableFarmData2Modules.bash
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@ source "$REPO_DIR/bin/preflight.bash"

echo "Enabling FarmData2 modules..."

echo " Enabling the farmOS Simple Auth Password Grant Module..."
docker exec -it fd2_farmos drush en simple_oauth_password_grant -y
error_check
echo " Enabled."

echo " Enabling the farmOS Default API Consumer Module..."
docker exec -it fd2_farmos drush en farm_api_default_consumer -y
error_check
echo " Enabled."

echo " Enabling the farmOS Inventory Module..."
docker exec -it fd2_farmos drush en farm_inventory -y
error_check
Expand Down
12 changes: 12 additions & 0 deletions src/sampleDB/generateAPIKeys.cy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
describe("Generate the farmOS API keys", () => {
it("Generate the keys", () => {
cy.login("admin", "admin");
cy.visit("admin/config/people/simple_oauth");

cy.get("#edit-keys").click();
cy.get("#dir_path").clear();
cy.get("#dir_path").type("../keys");

cy.get("[value='Generate']").click();
});
});

0 comments on commit dc606e8

Please # to comment.