toolshed/organising
7
1
Fork 0
Code Issues 100 Pull Requests Releases Activity

'app deploy' reports ''wordpress' has locally unstaged changes' when it doesn't #226

New Issue
Closed
opened 2021-11-01 09:29:11 +00:00 by 3wordchant · 9 comments
3wordchant commented 2021-11-01 09:29:11 +00:00
Owner
Copy Link

Trying to redeploy an app, seeing FATA[0005] wordpress has locally unstaged changes, but

➜ cd ~/.abra/apps/wordpress/ && git status
On branch master
Your branch is up to date with origin/master.

nothing to commit, working tree clean
Trying to redeploy an app, seeing `FATA[0005] wordpress has locally unstaged changes`, but ``` ➜ cd ~/.abra/apps/wordpress/ && git status On branch master Your branch is up to date with origin/master. nothing to commit, working tree clean ```
3wordchant added the
bug
abra
 labels 2021-11-01 09:29:11 +00:00
decentral1se commented 2021-11-02 14:16:57 +00:00
Owner
Copy Link

Couldn't reproduce but added debug logging in case we run into again.

Couldn't reproduce but added debug logging in case we run into again.
3wordchant commented 2021-11-22 12:28:36 +00:00
Author
Owner
Copy Link

I think your debug logging found the problem!

DEBU[0007] discovered git status for oasis repository: ?? .compose.yml.swp  caller="/home/user/Projects/Autonomic/CoopCloud/abra/pkg/git/read.go:49 IsClean"
FATA[0007] 'oasis' has locally unstaged changes          caller="/home/user/Projects/Autonomic/CoopCloud/abra/cli/catalogue/generate.go:139 glob..func1.1" stack="/home/user/Projects/Autonomic/CoopCloud/abra/cli/catalogue/generate.go:139 glob..func1.1\n/usr/lib/golang/src/runtime/asm_amd64.s:1371                            goexit"

I have a global ~/.gitignore file which excludes vim swapfiles. ~/.gitconfig:

[core]
	excludesFile = ~/.gitignore

~/.gitignore:

*.swp
*.swo

Is it possible that abra isn't picking up that config?

I think your debug logging found the problem! ``` DEBU[0007] discovered git status for oasis repository: ?? .compose.yml.swp caller="/home/user/Projects/Autonomic/CoopCloud/abra/pkg/git/read.go:49 IsClean" FATA[0007] 'oasis' has locally unstaged changes caller="/home/user/Projects/Autonomic/CoopCloud/abra/cli/catalogue/generate.go:139 glob..func1.1" stack="/home/user/Projects/Autonomic/CoopCloud/abra/cli/catalogue/generate.go:139 glob..func1.1\n/usr/lib/golang/src/runtime/asm_amd64.s:1371 goexit" ``` I have a global `~/.gitignore` file which excludes vim swapfiles. `~/.gitconfig`: ``` [core] excludesFile = ~/.gitignore ``` `~/.gitignore`: ``` *.swp *.swo ``` Is it possible that abra isn't picking up that config?
decentral1se commented 2021-11-22 20:13:54 +00:00
Owner
Copy Link

Global excludefiles gets taken into account now for IsClean call as far as I can tell. It seems like setting Force: True on the check outs is just causing misery so I switched that off for now (commit linked above too).

Global `excludefiles` gets taken into account now for `IsClean` call as far as I can tell. It seems like setting `Force: True` on the check outs is just causing misery so I switched that off for now (commit linked above too).
3wordchant commented 2021-11-23 11:28:34 +00:00
Author
Owner
Copy Link

Now I get a crash, weirdly on the Wordpress repo again 😬

The debugging output I added says that getExcludesFile(cfg) is getting an empty response 🤔

abra -d catalogue generate wordpress
DEBU[0000] '/home/f/.abra' already created, moving on...  caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/cli.go:90 newAbraApp.func1"
DEBU[0000] '/home/f/.abra/servers' already created, moving on...  caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/cli.go:90 newAbraApp.func1"
DEBU[0000] '/home/f/.abra/apps' already created, moving on...  caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/cli.go:90 newAbraApp.func1"
DEBU[0000] '/home/f/.abra/vendor' already created, moving on...  caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/cli.go:90 newAbraApp.func1"
DEBU[0000] abra version 'dev', commit '60de918e5027af3ec86d599c333d5506abd581c1'  caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/cli.go:96 newAbraApp.func1"
DEBU[0000] read 'map[DOMAIN:wordpress.example.com LETS_ENCRYPT_ENV:production SECRET_DB_PASSWORD_VERSION:v1 SECRET_DB_ROOT_PASSWORD_VERSION:v1 TYPE:wordpress]' from '/home/f/.abra/apps/wordpress/.env.sample'  caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/config/env.go:46 ReadEnv"
DEBU[0000] validated 'wordpress' as recipe argument      caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/internal/validate.go:37 ValidateRecipe"
DEBU[0000] '/home/f/.abra/catalogue' already exists, doing nothing  caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/git/clone.go:37 Clone"
DEBU[0000] fetching repo metadata from 'https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=1'  caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/catalogue/catalogue.go:357 ReadReposMetadata"
DEBU[0000] [DEBUG] GET https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=1  caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/web/client.go:15 customLeveledLogger.Printf"
DEBU[0002] fetching repo metadata from 'https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=2'  caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/catalogue/catalogue.go:357 ReadReposMetadata"
DEBU[0002] [DEBUG] GET https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=2  caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/web/client.go:15 customLeveledLogger.Printf"
DEBU[0004] fetching repo metadata from 'https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=3'  caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/catalogue/catalogue.go:357 ReadReposMetadata"
DEBU[0004] [DEBUG] GET https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=3  caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/web/client.go:15 customLeveledLogger.Printf"
DEBU[0006] fetching repo metadata from 'https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=4'  caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/catalogue/catalogue.go:357 ReadReposMetadata"
DEBU[0006] [DEBUG] GET https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=4  caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/web/client.go:15 customLeveledLogger.Printf"
DEBU[0008] fetching repo metadata from 'https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=5'  caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/catalogue/catalogue.go:357 ReadReposMetadata"
DEBU[0008] [DEBUG] GET https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=5  caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/web/client.go:15 customLeveledLogger.Printf"
DEBU[0009] ensuring '114' recipe(s) are locally present and up-to-date  caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/catalogue/generate.go:110 glob..func1"
DEBU[0009] '/home/f/.abra/apps/wordpress' already exists, doing nothing  caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/git/clone.go:37 Clone"                                                                                     
retrieving recipes...  65% |██████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████                                                                     | (75/114) DEBU[0009] opening /home/f/.abra/apps/wordpress          caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/git/read.go:39 IsClean"
DEBU[0009] fetching worktree                             caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/catalogue/generate.go:137 glob..func1.1"                                                                                   
DEBU[0009] getting exclude files                         caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/catalogue/generate.go:137 glob..func1.1"
DEBU[0009] found exclude file ''                         caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/git/read.go:83 GetExcludesFiles"                                                                                           
retrieving recipes...  71% |██████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████                                                         | (82/114) FATA[0009] open : no such file or directory              caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/catalogue/generate.go:139 glob..func1.1" stack="/home/f/Projects/Autonomic/CoopCloud/abra/cli/catalogue/generate.go:139 glob..func1.1\n/usr/lib/golang/src/runtime/asm_amd64.s:1371                            goexit"
Now I get a crash, weirdly on the Wordpress repo again 😬 The debugging output I added says that `getExcludesFile(cfg)` is getting an empty response 🤔 ``` abra -d catalogue generate wordpress DEBU[0000] '/home/f/.abra' already created, moving on... caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/cli.go:90 newAbraApp.func1" DEBU[0000] '/home/f/.abra/servers' already created, moving on... caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/cli.go:90 newAbraApp.func1" DEBU[0000] '/home/f/.abra/apps' already created, moving on... caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/cli.go:90 newAbraApp.func1" DEBU[0000] '/home/f/.abra/vendor' already created, moving on... caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/cli.go:90 newAbraApp.func1" DEBU[0000] abra version 'dev', commit '60de918e5027af3ec86d599c333d5506abd581c1' caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/cli.go:96 newAbraApp.func1" DEBU[0000] read 'map[DOMAIN:wordpress.example.com LETS_ENCRYPT_ENV:production SECRET_DB_PASSWORD_VERSION:v1 SECRET_DB_ROOT_PASSWORD_VERSION:v1 TYPE:wordpress]' from '/home/f/.abra/apps/wordpress/.env.sample' caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/config/env.go:46 ReadEnv" DEBU[0000] validated 'wordpress' as recipe argument caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/internal/validate.go:37 ValidateRecipe" DEBU[0000] '/home/f/.abra/catalogue' already exists, doing nothing caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/git/clone.go:37 Clone" DEBU[0000] fetching repo metadata from 'https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=1' caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/catalogue/catalogue.go:357 ReadReposMetadata" DEBU[0000] [DEBUG] GET https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=1 caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/web/client.go:15 customLeveledLogger.Printf" DEBU[0002] fetching repo metadata from 'https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=2' caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/catalogue/catalogue.go:357 ReadReposMetadata" DEBU[0002] [DEBUG] GET https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=2 caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/web/client.go:15 customLeveledLogger.Printf" DEBU[0004] fetching repo metadata from 'https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=3' caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/catalogue/catalogue.go:357 ReadReposMetadata" DEBU[0004] [DEBUG] GET https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=3 caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/web/client.go:15 customLeveledLogger.Printf" DEBU[0006] fetching repo metadata from 'https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=4' caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/catalogue/catalogue.go:357 ReadReposMetadata" DEBU[0006] [DEBUG] GET https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=4 caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/web/client.go:15 customLeveledLogger.Printf" DEBU[0008] fetching repo metadata from 'https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=5' caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/catalogue/catalogue.go:357 ReadReposMetadata" DEBU[0008] [DEBUG] GET https://git.coopcloud.tech/api/v1/orgs/coop-cloud/repos?page=5 caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/web/client.go:15 customLeveledLogger.Printf" DEBU[0009] ensuring '114' recipe(s) are locally present and up-to-date caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/catalogue/generate.go:110 glob..func1" DEBU[0009] '/home/f/.abra/apps/wordpress' already exists, doing nothing caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/git/clone.go:37 Clone" retrieving recipes... 65% |██████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████ | (75/114) DEBU[0009] opening /home/f/.abra/apps/wordpress caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/git/read.go:39 IsClean" DEBU[0009] fetching worktree caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/catalogue/generate.go:137 glob..func1.1" DEBU[0009] getting exclude files caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/catalogue/generate.go:137 glob..func1.1" DEBU[0009] found exclude file '' caller="/home/f/Projects/Autonomic/CoopCloud/abra/pkg/git/read.go:83 GetExcludesFiles" retrieving recipes... 71% |██████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████████ | (82/114) FATA[0009] open : no such file or directory caller="/home/f/Projects/Autonomic/CoopCloud/abra/cli/catalogue/generate.go:139 glob..func1.1" stack="/home/f/Projects/Autonomic/CoopCloud/abra/cli/catalogue/generate.go:139 glob..func1.1\n/usr/lib/golang/src/runtime/asm_amd64.s:1371 goexit" ```
3wordchant commented 2021-11-23 11:29:41 +00:00
Author
Owner
Copy Link

If I comment out these lines it works again:

	patterns, err := GetExcludesFiles()
	if err != nil {
		return false, err
	}
	worktree.Excludes = append(patterns, worktree.Excludes...)

But I assume back to not taking ~/.gitignore into account.

If I comment out these lines it works again: ``` patterns, err := GetExcludesFiles() if err != nil { return false, err } worktree.Excludes = append(patterns, worktree.Excludes...) ``` But I assume back to not taking `~/.gitignore` into account.
decentral1se commented 2021-12-11 19:03:14 +00:00
Owner
Copy Link

Tried to fix this again. Could you give latest another test run @3wordchant 🙏

/cc @knoflook so i don't lose you more time on some random stack trace in a coop-cloud/abra#141 round 2 🙃

Tried to fix this again. Could you give latest another test run @3wordchant 🙏 /cc @knoflook so i don't lose you more time on some random stack trace in a https://git.coopcloud.tech/coop-cloud/abra/pulls/141 round 2 🙃
decentral1se commented 2021-12-11 19:06:52 +00:00
Owner
Copy Link

btw, just in case we have different configs, here is my setup:

~/.gitconfig:

[core]
  excludesfile = ~/.gitignore_global

~/.gitignore_global:

...paths...

It reads the ~/.gitconfig first for this excludefiles config but I guess if you're not using that line, it could just try the default ~/.gitignore file? Will throw this in as well.

btw, just in case we have different configs, here is my setup: `~/.gitconfig`: ``` [core] excludesfile = ~/.gitignore_global ``` `~/.gitignore_global`: ``` ...paths... ``` It reads the `~/.gitconfig` first for this `excludefiles` config but I guess if you're not using that line, it could just try the default `~/.gitignore` file? Will throw this in as well.
3wordchant commented 2021-12-11 20:01:56 +00:00
Author
Owner
Copy Link

Yep I've got basically the same config:

[core]
	excludesFile = ~/.gitignore
	attributesfile = ~/.gitattributes

I'll test out the new change ASAP!

Yep I've got basically the same config: ``` [core] excludesFile = ~/.gitignore attributesfile = ~/.gitattributes ``` I'll test out the new change ASAP!
decentral1se added this to the Beta release (software) project 2021-12-12 17:12:23 +00:00
decentral1se added the
awaiting-feedback
 label 2021-12-12 17:13:02 +00:00
decentral1se commented 2022-01-03 17:38:31 +00:00
Owner
Copy Link

I've tested this manually a few times, think it is fixed 🙏

I've tested this manually a few times, think it is fixed 🙏
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
abra
Everything to do with abra
abra-gandi
Abra Gandi plugin
awaiting-feedback
Ping/pong on comms
backups
bug
Something is not working
build
Go build related issues
ci/cd
Getting the robots into the mix
community organising
Opening this thing up
contributing
Contributors stuff
coopcloud.tech
Our main website
democracy
Democratic decision making
design
Design thinking required
documentation
Let's write things together
duplicate
This issue or pull request already exists
enhancement
New feature
finance
Money things
funding
Anything related to grant funding
good first issue
Easy start with development
help wanted
Need some help
installer
Installation related issues
kadabra
performance
Performance related
proposal
Large change which requires feedback & decisin making
question
More information is needed
recipes.coopcloud.tech
Our recipes catalogue
security
Securing our shit
test
Unit or integration test suite
wontfix
This won't be fixed
No Label
abra
awaiting-feedback
bug
Milestone
No items
No Milestone
Projects
Clear projects
No project Beta release (software)
Assignees
Clear assignees
3wordchant aadil abra-bot ammaratef45 Apfelwurm carla cas coopcloud cyrnel decentral1se fauno iexos jade jmakdah2 joe-irving kawaiipunk knoflook kolaente lambdabundesverband linnealovespie moritz notplants p4u1 pharaohgraphy renovate-bot ripclap simon sixsmith trav val yksflip
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: toolshed/organising#226
No description provided.
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?