Skip to content

Commit 71eca83

Browse files
committed
fix: Fixed import params
1 parent df76193 commit 71eca83

File tree

2 files changed

+44
-76
lines changed

2 files changed

+44
-76
lines changed

codify.json

Lines changed: 43 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,26 @@
55
"default": "../codify-homebrew-plugin/src/index.ts"
66
}
77
},
8+
{ "type": "path", "path": "$HOME/.bun/bin"},
9+
{
10+
"type": "path",
11+
"paths": [
12+
"$PYENV_ROOT/bin",
13+
"$BUN_INSTALL/bin",
14+
"$DENO_INSTALL/bin",
15+
"~/.jenv/bin",
16+
"~/a/random/path",
17+
"$NVM_DIR/.bin/2",
18+
"$NVM_DIR/.bin/3"
19+
],
20+
"name": "1"
21+
},
822
{
923
"type": "homebrew",
1024
"taps": [
1125
"cirruslabs/cli",
1226
"hashicorp/tap",
27+
"homebrew/bundle",
1328
"homebrew/services"
1429
],
1530
"casks": [
@@ -20,75 +35,22 @@
2035
"formulae": [
2136
"ack",
2237
"asciinema",
23-
"ca-certificates",
24-
"cairo",
2538
"cirrus",
2639
"expect",
27-
"fontconfig",
28-
"freetype",
29-
"fribidi",
30-
"gettext",
31-
"ghostscript",
32-
"giflib",
3340
"git-lfs",
34-
"glib",
35-
"graphite2",
3641
"groff",
37-
"harfbuzz",
3842
"hyperfine",
39-
"icu4c",
40-
"jasper",
41-
"jbig2dec",
4243
"jenv",
43-
"jpeg-turbo",
4444
"jq",
45-
"krb5",
46-
"leptonica",
47-
"libarchive",
48-
"libb2",
49-
"libidn",
50-
"libpaper",
51-
"libpng",
52-
"libpq",
53-
"libtiff",
54-
"libx11",
55-
"libxau",
56-
"libxcb",
57-
"libxdmcp",
58-
"libxext",
59-
"libxfixes",
60-
"libxi",
61-
"libxrender",
62-
"little-cms2",
63-
"lz4",
64-
"lzo",
6545
"mas",
66-
"mpdecimal",
67-
"netpbm",
68-
"oniguruma",
6946
"openjdk@11",
7047
"openjdk@17",
71-
"openjpeg",
72-
"openssl@3",
48+
"openjdk@21",
7349
"packer",
74-
"pango",
75-
"pcre2",
7650
"pgcli",
77-
"pixman",
7851
"postgresql@14",
79-
"psutils",
80-
"python-packaging",
81-
"python@3.12",
82-
"readline",
83-
"softnet",
84-
"sqlite",
8552
"sshpass",
8653
"tart",
87-
"tcl-tk",
88-
"tesseract",
89-
"uchardet",
90-
"webp",
91-
"xorgproto",
9254
"xz",
9355
"zstd"
9456
]
@@ -110,7 +72,7 @@
11072
},
11173
{
11274
"Host": "*",
113-
"AddKeysToAgent": "yes",
75+
"AddKeysToAgent": true,
11476
"IdentityFile": "~/.ssh/id_ed25519"
11577
},
11678
{
@@ -131,7 +93,6 @@
13193
"type": "ssh-key",
13294
"fileName": "id_ed25519",
13395
"passphrase": "",
134-
"folder": "/Users/kevinwang/.ssh",
13596
"keyType": "ed25519"
13697
},
13798
{
@@ -147,20 +108,30 @@
147108
{
148109
"type": "pgcli"
149110
},
111+
{
112+
"type": "file",
113+
"contents": "[\n\t{\n \"type\": \"homebrew\",\n \"taps\": [\n \"cirruslabs/cli\",\n \"hashicorp/tap\",\n \"homebrew/services\"\n ],\n \"formulae\": [\n \"asciinema\",\n \"cairo\",\n \"cirrus\",\n \"expect\",\n \"glib\",\n \"hyperfine\",\n \"icu4c\",\n \"jq\",\n \"mas\",\n \"packer\",\n \"sshpass\",\n \"tart\"\n ],\n \"casks\": [\n \t\"firefox\",\n \t\"notion\",\n \t\"sublime-text\",\n \t\"webstorm\",\n \t\"mac-mouse-fix\",\n \t\"wins\",\n \t\"warp\",\n \t\"hammerspoon\",\n \t\"rectangle\",\n \t\"alt-tab\",\n \t\"betterdisplay\",\n \t\"daisydisk\",\n \t\"visual-studio-code\"\n ]\n },\n\n\t{ \"type\": \"nvm\", \"nodeVersions\": [\"20\"], \"global\": \"20\" },\n\t{ \"type\": \"pyenv\", \"pythonVersions\": [\"3.12\", \"3.11\"], \"global\": \"3.11\" },\n\n\t{\n \"type\": \"ssh-key\",\n \"fileName\": \"id_ed25519\",\n \"passphrase\": \"\",\n \"folder\": \"/Users/kevinwang/.ssh\",\n \"keyType\": \"ed25519\"\n },\n { \"type\": \"terraform\" },\n { \"type\": \"git-clone\", \"directory\": \"~/projects/codify\", \"repository\": \"git@github.com:kevinwang5658/codify.git\" },\n { \"type\": \"git-clone\", \"directory\": \"~/projects/codify-web\", \"repository\": \"git@github.com:kevinwang5658/codify-web.git\" },\n\t{ \"type\": \"git-clone\", \"directory\": \"~/projects/codify-homebrew-plugin\", \"repository\": \"git@github.com:kevinwang5658/codify-homebrew-plugin.git\" },\n { \"type\": \"git-clone\", \"directory\": \"~/projects/codify-infrastructure\", \"repository\": \"git@github.com:kevinwang5658/codify-infrastructure.git\" },\n { \"type\": \"git-clone\", \"directory\": \"~/projects/codify-docs\", \"repository\": \"git@github.com:kevinwang5658/codify-docs.git\" },\n { \"type\": \"git-clone\", \"directory\": \"~/projects/codify-ink-form\", \"repository\": \"git@github.com:kevinwang5658/codify-ink-form.git\" },\n\n\n { \"type\": \"action\", \"condition\": \"[ -d node_modules ]\", \"action\": \"npm install\", \"cwd\": \"~/projects/codify\", \"dependsOn\": [\"git-clone.0\", \"nvm\"]},\n { \"type\": \"action\", \"condition\": \"[ -d node_modules ]\", \"action\": \"npm install\", \"cwd\": \"~/projects/codify-web\", \"dependsOn\": [\"git-clone.1\", \"nvm\"]},\n { \"type\": \"action\", \"condition\": \"[ -d node_modules ]\", \"action\": \"npm install\", \"cwd\": \"~/projects/codify-homebrew-plugin\", \"dependsOn\": [\"git-clone.2\", \"nvm\"]},\n { \"type\": \"action\", \"condition\": \"[ -d node_modules ]\", \"action\": \"npm install\", \"cwd\": \"~/projects/codify-docs\", \"dependsOn\": [\"git-clone.4\", \"nvm\"]},\n { \"type\": \"action\", \"condition\": \"[ -d node_modules ]\", \"action\": \"npm install\", \"cwd\": \"~/projects/codify-ink-form\", \"dependsOn\": [\"git-clone.5\", \"nvm\"]}\n]",
114+
"path": "~/codify.json"
115+
},
150116
{
151117
"type": "aws-cli"
152118
},
153119
{
154-
"type": "vscode",
155-
"directory": "/Applications"
120+
"type": "git-clone",
121+
"directory": "~/Projects/codify-homebrew-plugin",
122+
"repository": "git@github.com:kevinwang5658/codify-homebrew-plugin.git"
156123
},
157124
{
158-
"type": "xcode-tools"
125+
"type": "vscode"
159126
},
160127
{
161128
"type": "git-clone",
162-
"autoVerifySSH": true,
163-
"directory": "/Users/kevinwang/projects/codify",
129+
"directory": "~/Projects/codify-plugin-lib",
130+
"repository": "git@github.com:kevinwang5658/codify-plugin-lib.git"
131+
},
132+
{
133+
"type": "git-clone",
134+
"directory": "~/Projects/codify",
164135
"repository": "git@github.com:kevinwang5658/codify.git"
165136
},
166137
{
@@ -181,11 +152,6 @@
181152
"email": "kevinwang5658@gmail.com",
182153
"username": "kevinwang"
183154
},
184-
{
185-
"type": "android-studio",
186-
"directory": "/Applications",
187-
"version": "2023.3.1.20"
188-
},
189155
{
190156
"type": "nvm",
191157
"global": "20.15.1",
@@ -198,26 +164,28 @@
198164
"23.3.0"
199165
]
200166
},
167+
{
168+
"type": "android-studio",
169+
"version": "2023.3.1.20"
170+
},
171+
{
172+
"type": "ssh-add",
173+
"path": "~/.ssh/id_ed25519"
174+
},
201175
{
202176
"type": "jenv",
203177
"add": [
204-
"system",
205178
"11",
206-
"11.0",
207-
"11.0.24",
208179
"17",
209-
"17.0.12",
210-
"openjdk64-11.0.24",
211-
"openjdk64-17.0.12"
180+
"21"
212181
],
213182
"global": "17"
214183
},
215184
{
216185
"type": "aws-profile",
217-
"region": "us-west-2",
218186
"awsAccessKeyId": "AKIATCKATKL55TT5UZ7P",
219187
"awsSecretAccessKey": "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",
220-
"output": "json",
221-
"profile": "codify"
188+
"profile": "codify",
189+
"region": "us-east-1"
222190
}
223191
]

src/orchestrators/import.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class ImportOrchestrator {
4545
args: ImportArgs,
4646
reporter: Reporter
4747
) {
48-
const { typeIds } = args
48+
const typeIds = args.typeIds?.filter(Boolean)
4949
ctx.processStarted(ProcessName.IMPORT)
5050

5151
const initializationResult = await InitializeOrchestrator.run(

0 commit comments

Comments
 (0)