diff --git a/cli/dockercompose/auth_test.go b/cli/dockercompose/auth_test.go index 1598c31a1..c1d1d3310 100644 --- a/cli/dockercompose/auth_test.go +++ b/cli/dockercompose/auth_test.go @@ -53,6 +53,7 @@ func expectedAuth() *Service { "AUTH_PROVIDER_APPLE_ENABLED": "true", "AUTH_PROVIDER_APPLE_KEY_ID": "appleKeyId", "AUTH_PROVIDER_APPLE_PRIVATE_KEY": "applePrivateKey", + "AUTH_PROVIDER_APPLE_SCOPE": "", "AUTH_PROVIDER_APPLE_TEAM_ID": "appleTeamId", "AUTH_PROVIDER_AZUREAD_CLIENT_ID": "azureadClientId", "AUTH_PROVIDER_AZUREAD_CLIENT_SECRET": "azureadClientSecret", @@ -75,9 +76,12 @@ func expectedAuth() *Service { "AUTH_PROVIDER_FACEBOOK_CLIENT_SECRET": "facebookClientSecret", "AUTH_PROVIDER_FACEBOOK_ENABLED": "true", "AUTH_PROVIDER_FACEBOOK_SCOPE": "email", + "AUTH_PROVIDER_GITHUB_AUDIENCE": "audience", "AUTH_PROVIDER_GITHUB_CLIENT_ID": "githubClientId", "AUTH_PROVIDER_GITHUB_CLIENT_SECRET": "githubClientSecret", "AUTH_PROVIDER_GITHUB_ENABLED": "true", + "AUTH_PROVIDER_GITHUB_SCOPE": "user:email", + "AUTH_PROVIDER_GITLAB_AUDIENCE": "audience", "AUTH_PROVIDER_GITLAB_CLIENT_ID": "gitlabClientId", "AUTH_PROVIDER_GITLAB_CLIENT_SECRET": "gitlabClientSecret", "AUTH_PROVIDER_GITLAB_ENABLED": "true", @@ -97,6 +101,7 @@ func expectedAuth() *Service { "AUTH_PROVIDER_SPOTIFY_CLIENT_SECRET": "spotifyClientSecret", "AUTH_PROVIDER_SPOTIFY_ENABLED": "true", "AUTH_PROVIDER_SPOTIFY_SCOPE": "user-read-email", + "AUTH_PROVIDER_STRAVA_AUDIENCE": "audience", "AUTH_PROVIDER_STRAVA_CLIENT_ID": "stravaClientId", "AUTH_PROVIDER_STRAVA_CLIENT_SECRET": "stravaClientSecret", "AUTH_PROVIDER_STRAVA_ENABLED": "true", diff --git a/cli/mcp/resources/nhost_toml_schema.cue b/cli/mcp/resources/nhost_toml_schema.cue index 949fdefdf..e751881b6 100644 --- a/cli/mcp/resources/nhost_toml_schema.cue +++ b/cli/mcp/resources/nhost_toml_schema.cue @@ -223,7 +223,7 @@ import ( // Releases: // // https://github.com/nhost/hasura-storage/releases - version: string | *"0.8.2" + version: string | *"0.9.1" // Networking (custom domains at the moment) are not allowed as we need to do further // configurations in the CDN. We will enable it again in the future. @@ -311,7 +311,7 @@ import ( // Releases: // // https://github.com/nhost/hasura-auth/releases - version: string | *"0.42.4" + version: string | *"0.43.0" // Resources for the service resources?: #Resources diff --git a/cli/ssl/.ssl/local-fullchain.pem b/cli/ssl/.ssl/local-fullchain.pem index 5a1077f23..20d6117f8 100644 --- a/cli/ssl/.ssl/local-fullchain.pem +++ b/cli/ssl/.ssl/local-fullchain.pem @@ -1,27 +1,27 @@ -----BEGIN CERTIFICATE----- -MIIERDCCA8mgAwIBAgISBmRex3kpZ4Mz1/1kq05iqja/MAoGCCqGSM49BAMDMDIx +MIIERTCCA8ugAwIBAgISBWD/E+b14mP5jv4DGWRVYv8fMAoGCCqGSM49BAMDMDIx CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF -ODAeFw0yNTEwMDIxMDUxNDBaFw0yNTEyMzExMDUxMzlaMB8xHTAbBgNVBAMTFGxv -Y2FsLmF1dGgubmhvc3QucnVuMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE2cVM -ojf8iXZGLneNfnke5LMJIxyTEeGbNOfCv4SOR4K/N4OkpvkUVbH2bRvX99uE9jaK -515Y48PzPA/4+W1zTKOCAtAwggLMMA4GA1UdDwEB/wQEAwIHgDAdBgNVHSUEFjAU -BggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUQqan -raZoU5klAxsgkEVEMIkxmMQwHwYDVR0jBBgwFoAUjw0TovYuftFQbDMYOF1ZjiNy +ODAeFw0yNTExMDYxMDUxMTBaFw0yNjAyMDQxMDUxMDlaMB8xHTAbBgNVBAMTFGxv +Y2FsLmF1dGgubmhvc3QucnVuMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEOah5 +ZLuUQp3pdMBxBWnT6E6/amW9LerKKEEdy3Nc8iAwG9LlnPH0z3m7a9wgEhpFEdlL +Rr+qO+NhSRnv6+UF5KOCAtIwggLOMA4GA1UdDwEB/wQEAwIHgDAdBgNVHSUEFjAU +BggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUGyb1 +TVK/0vf3uHO4x3R094aG2rEwHwYDVR0jBBgwFoAUjw0TovYuftFQbDMYOF1ZjiNy kcowMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzAChhZodHRwOi8vZTguaS5sZW5j ci5vcmcvMIHOBgNVHREEgcYwgcOCFGxvY2FsLmF1dGgubmhvc3QucnVughlsb2Nh bC5kYXNoYm9hcmQubmhvc3QucnVughJsb2NhbC5kYi5uaG9zdC5ydW6CGWxvY2Fs LmZ1bmN0aW9ucy5uaG9zdC5ydW6CF2xvY2FsLmdyYXBocWwubmhvc3QucnVughZs b2NhbC5oYXN1cmEubmhvc3QucnVughdsb2NhbC5tYWlsaG9nLm5ob3N0LnJ1boIX bG9jYWwuc3RvcmFnZS5uaG9zdC5ydW4wEwYDVR0gBAwwCjAIBgZngQwBAgEwLQYD -VR0fBCYwJDAioCCgHoYcaHR0cDovL2U4LmMubGVuY3Iub3JnLzY0LmNybDCCAQIG -CisGAQQB1nkCBAIEgfMEgfAA7gB1AO08S9boBsKkogBX28sk4jgB31Ev7cSGxXAP -IN23Pj/gAAABmaTCI4YAAAQDAEYwRAIgXLRFL1EAXfvN6kd5m6udqlxfz4+5B6rq -Cdhp/ZwDAZ8CIFYvalTkl5NEBEMD3vpPvrj8s1Yy2xsropEh/AvpavvLAHUAGYbU -xyiqb/66A294Kk0BkarOLXIxD67OXXBBLSVMx9QAAAGZpMIjhwAABAMARjBEAiBk -H1vqU9HNuBcf4UYL/xZ42BeUAARHStiFaIZtnR1kEgIgbIJ0CGqIpxmWuwCunl9p -ar+rGLdQrCk9BZXq/VjPPAAwCgYIKoZIzj0EAwMDaQAwZgIxAKvk5a2zQsv7JLNj -NO1ly+DI8qiy5nf4HQrOrHOjtmx5RUu0HSO9P0J0u069qAqXMgIxAMLdME9JUo2c -TJo3pwWv5MRyg/MkOJ4ImKdDJXfIZNkEIUyP3vwTqImvZe07gJDsYg== +VR0fBCYwJDAioCCgHoYcaHR0cDovL2U4LmMubGVuY3Iub3JnLzMyLmNybDCCAQQG +CisGAQQB1nkCBAIEgfUEgfIA8AB2ABmG1Mcoqm/+ugNveCpNAZGqzi1yMQ+uzl1w +QS0lTMfUAAABmlkAQokAAAQDAEcwRQIgWDtSxJfM2xcjvScVHOkn8bipzBhNhTnm +B89TDh1/4XUCIQDe08W33PCx2D+akCdW9U9mZKQpIW6deLZSI3ZWpSNKMAB2AA5X +lLzzrqk+MxssmQez95Dfm8I9cTIl3SGpJaxhxU4hAAABmlkAQn8AAAQDAEcwRQIg +KnojmNTpNk1OFTQI0EnlPa2bpwqmUgmUCLeqE6SWfgoCIQCrhZbxYPHbGLF/HpRq +vCTcOh24SRCuxlkqtaowbbfmKjAKBggqhkjOPQQDAwNoADBlAjEArstFIC+KAsfQ +nLhtqsaNzkhftN5adDyr2CoE0WUPF1sLDi+xDnDO+JgIPL0YKAFNAjATJ4omhpc+ +I6/kWcef2RyO9YCGQQE9pdez5CYKb9o8YAntDSHM3b5nXXj3AX/USdQ= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- MIIEVjCCAj6gAwIBAgIQY5WTY8JOcIJxWRi/w9ftVjANBgkqhkiG9w0BAQsFADBP diff --git a/cli/ssl/.ssl/local-privkey.pem b/cli/ssl/.ssl/local-privkey.pem index bc44190a0..6e24f8902 100644 --- a/cli/ssl/.ssl/local-privkey.pem +++ b/cli/ssl/.ssl/local-privkey.pem @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgfJZOkvawA0vBMw9W -ph8i1Z+SJQrFscPbqSYpxngzEDahRANCAATZxUyiN/yJdkYud41+eR7kswkjHJMR -4Zs058K/hI5Hgr83g6Sm+RRVsfZtG9f324T2NornXljjw/M8D/j5bXNM +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgInXN4JRnXNTjx7rM +avurZrN1EV1iebQeNUlMlFp7VJ+hRANCAAQ5qHlku5RCnel0wHEFadPoTr9qZb0t +6sooQR3Lc1zyIDAb0uWc8fTPebtr3CASGkUR2UtGv6o742FJGe/r5QXk -----END PRIVATE KEY----- diff --git a/cli/ssl/.ssl/sub-fullchain.pem b/cli/ssl/.ssl/sub-fullchain.pem index cba65d045..0b0239912 100644 --- a/cli/ssl/.ssl/sub-fullchain.pem +++ b/cli/ssl/.ssl/sub-fullchain.pem @@ -1,52 +1,52 @@ -----BEGIN CERTIFICATE----- -MIIEWDCCA96gAwIBAgISBbvrSsjDQm4zevwwjxFGmeTMMAoGCCqGSM49BAMDMDIx +MIIEVzCCA92gAwIBAgISBm54VdkoqD8s8efq7ceHaTihMAoGCCqGSM49BAMDMDIx CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF -NzAeFw0yNTEwMDIxMDUyNTdaFw0yNTEyMzExMDUyNTZaMCExHzAdBgNVBAMMFiou -YXV0aC5sb2NhbC5uaG9zdC5ydW4wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAATG -x0o7t0pSrOoFc+pljtqJVxgaSW+w9D9C2WdysMeSKKOU+0MzaM4ynLUhETOpBs8E -612mdcoeak+G1Emj6UVwo4IC4zCCAt8wDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQW -MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQ+ -lVsLiXSRLAECs9OgkCEBS7jMmzAfBgNVHSMEGDAWgBSuSJ7chx1EoG/aouVgdAR4 -wpwAgDAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly9lNy5pLmxl +ODAeFw0yNTExMDYxMDUyMjBaFw0yNjAyMDQxMDUyMTlaMCExHzAdBgNVBAMMFiou +YXV0aC5sb2NhbC5uaG9zdC5ydW4wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASI +rTkZOM4ip42DCyDADXGc7oV3+OkimyTM3st2RIZWG28rFRwH0LebJV2cduq1Hdtl +VxIEr+RhvyIL7gllueXUo4IC4jCCAt4wDgYDVR0PAQH/BAQDAgeAMB0GA1UdJQQW +MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTw +bM86O381+aljU3oTUvwhZ90PCDAfBgNVHSMEGDAWgBSPDROi9i5+0VBsMxg4XVmO +I3KRyjAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly9lOC5pLmxl bmNyLm9yZy8wgd4GA1UdEQSB1jCB04IWKi5hdXRoLmxvY2FsLm5ob3N0LnJ1boIb Ki5kYXNoYm9hcmQubG9jYWwubmhvc3QucnVughQqLmRiLmxvY2FsLm5ob3N0LnJ1 boIbKi5mdW5jdGlvbnMubG9jYWwubmhvc3QucnVughkqLmdyYXBocWwubG9jYWwu bmhvc3QucnVughgqLmhhc3VyYS5sb2NhbC5uaG9zdC5ydW6CGSoubWFpbGhvZy5s b2NhbC5uaG9zdC5ydW6CGSouc3RvcmFnZS5sb2NhbC5uaG9zdC5ydW4wEwYDVR0g -BAwwCjAIBgZngQwBAgEwLQYDVR0fBCYwJDAioCCgHoYcaHR0cDovL2U3LmMubGVu -Y3Iub3JnLzc3LmNybDCCAQUGCisGAQQB1nkCBAIEgfYEgfMA8QB2AN3cyjSV1+EW -BeeVMvrHn/g9HFDf2wA6FBJ2Ciysu8gqAAABmaTDUHkAAAQDAEcwRQIgWudJ8XKA -BT5jq5Tl0xQLNb953pBi22Tb0TIWk+RSqHgCIQDsTrLVMFaQTV7EFCY1tFhi5qae -SCpEwwdFcnom/nz6EAB3AO08S9boBsKkogBX28sk4jgB31Ev7cSGxXAPIN23Pj/g -AAABmaTDWAsAAAQDAEgwRgIhALxIgIiutEwgNcGw7/cAdjFqUugct4HlZezIOLLP -rg69AiEA8YCaK41rJDYztEKUIJEq2J2ktSqGYcl9gNKC+SiR4acwCgYIKoZIzj0E -AwMDaAAwZQIwVG9yOiMRfKFFyFj1R8X/5U67QD84OhZ0oM0SZsVhezLedG5b8eFf -/cWraREi8xbFAjEA/6RXweGzl08F7EtqBDoiqitScI2rbwGtP6s/evL0zXTABZD2 -ih7AGxjtg80IqIRe +BAwwCjAIBgZngQwBAgEwLQYDVR0fBCYwJDAioCCgHoYcaHR0cDovL2U4LmMubGVu +Y3Iub3JnLzM0LmNybDCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB2AEmcm2neHXzs +/DbezYdkprhbrwqHgBnRVVL76esp3fjDAAABmlkBVgkAAAQDAEcwRQIhANH6Ml3u +IM4nAzwAIjIjBjn8EWbn1ZHfgwO+rlSo5rzpAiATPKE8Mx5LK1IayG5VCK1eCDyc +rzt1HNbP9WSrpuHx+gB2ABmG1Mcoqm/+ugNveCpNAZGqzi1yMQ+uzl1wQS0lTMfU +AAABmlkBVgcAAAQDAEcwRQIgIT/DhsIj9Aw7qf/2lknJCr907dEqC3/+QN3zlcOj +iKoCIQCTguinYjJPZwU2dblaRQ2q7MTCMT2ZENExltxwYG3GzjAKBggqhkjOPQQD +AwNoADBlAjEA5nFoNrLyeC079YpRvdah/HZIA/lUBh+LOo/NcEBD3aTGs2z8hU8z +H4vMy3OnfQ9TAjBxigm7zE5/3CAcGoSOr/P0TL52nh+lO4SUVxcbKgYB8A2yo6o/ +kUkG7PiRB0uUpNw= -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIIEVzCCAj+gAwIBAgIRAKp18eYrjwoiCWbTi7/UuqEwDQYJKoZIhvcNAQELBQAw -TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh -cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw -WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg -RW5jcnlwdDELMAkGA1UEAxMCRTcwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARB6AST -CFh/vjcwDMCgQer+VtqEkz7JANurZxLP+U9TCeioL6sp5Z8VRvRbYk4P1INBmbef -QHJFHCxcSjKmwtvGBWpl/9ra8HW0QDsUaJW2qOJqceJ0ZVFT3hbUHifBM/2jgfgw -gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD -ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSuSJ7chx1EoG/aouVgdAR4 -wpwAgDAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB -AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g -BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu -Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAjx66fDdLk5ywFn3CzA1w1qfylHUD -aEf0QZpXcJseddJGSfbUUOvbNR9N/QQ16K1lXl4VFyhmGXDT5Kdfcr0RvIIVrNxF -h4lqHtRRCP6RBRstqbZ2zURgqakn/Xip0iaQL0IdfHBZr396FgknniRYFckKORPG -yM3QKnd66gtMst8I5nkRQlAg/Jb+Gc3egIvuGKWboE1G89NTsN9LTDD3PLj0dUMr -OIuqVjLB8pEC6yk9enrlrqjXQgkLEYhXzq7dLafv5Vkig6Gl0nuuqjqfp0Q1bi1o -yVNAlXe6aUXw92CcghC9bNsKEO1+M52YY5+ofIXlS/SEQbvVYYBLZ5yeiglV6t3S -M6H+vTG0aP9YHzLn/KVOHzGQfXDP7qM5tkf+7diZe7o2fw6O7IvN6fsQXEQQj8TJ -UXJxv2/uJhcuy/tSDgXwHM8Uk34WNbRT7zGTGkQRX0gsbjAea/jYAoWv0ZvQRwpq -Pe79D/i7Cep8qWnA+7AE/3B3S/3dEEYmc0lpe1366A/6GEgk3ktr9PEoQrLChs6I -tu3wnNLB2euC8IKGLQFpGtOO/2/hiAKjyajaBP25w1jF0Wl8Bbqne3uZ2q1GyPFJ -YRmT7/OXpmOH/FVLtwS+8ng1cAmpCujPwteJZNcDG0sF2n/sc0+SQf49fdyUK0ty -+VUwFj9tmWxyR/M= +MIIEVjCCAj6gAwIBAgIQY5WTY8JOcIJxWRi/w9ftVjANBgkqhkiG9w0BAQsFADBP +MQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFy +Y2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTAeFw0yNDAzMTMwMDAwMDBa +Fw0yNzAzMTIyMzU5NTlaMDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBF +bmNyeXB0MQswCQYDVQQDEwJFODB2MBAGByqGSM49AgEGBSuBBAAiA2IABNFl8l7c +S7QMApzSsvru6WyrOq44ofTUOTIzxULUzDMMNMchIJBwXOhiLxxxs0LXeb5GDcHb +R6EToMffgSZjO9SNHfY9gjMy9vQr5/WWOrQTZxh7az6NSNnq3u2ubT6HTKOB+DCB +9TAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB +MBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFI8NE6L2Ln7RUGwzGDhdWY4j +cpHKMB8GA1UdIwQYMBaAFHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEB +BCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzATBgNVHSAE +DDAKMAgGBmeBDAECATAnBgNVHR8EIDAeMBygGqAYhhZodHRwOi8veDEuYy5sZW5j +ci5vcmcvMA0GCSqGSIb3DQEBCwUAA4ICAQBnE0hGINKsCYWi0Xx1ygxD5qihEjZ0 +RI3tTZz1wuATH3ZwYPIp97kWEayanD1j0cDhIYzy4CkDo2jB8D5t0a6zZWzlr98d +AQFNh8uKJkIHdLShy+nUyeZxc5bNeMp1Lu0gSzE4McqfmNMvIpeiwWSYO9w82Ob8 +otvXcO2JUYi3svHIWRm3+707DUbL51XMcY2iZdlCq4Wa9nbuk3WTU4gr6LY8MzVA +aDQG2+4U3eJ6qUF10bBnR1uuVyDYs9RhrwucRVnfuDj29CMLTsplM5f5wSV5hUpm +Uwp/vV7M4w4aGunt74koX71n4EdagCsL/Yk5+mAQU0+tue0JOfAV/R6t1k+Xk9s2 +HMQFeoxppfzAVC04FdG9M+AC2JWxmFSt6BCuh3CEey3fE52Qrj9YM75rtvIjsm/1 +Hl+u//Wqxnu1ZQ4jpa+VpuZiGOlWrqSP9eogdOhCGisnyewWJwRQOqK16wiGyZeR +xs/Bekw65vwSIaVkBruPiTfMOo0Zh4gVa8/qJgMbJbyrwwG97z/PRgmLKCDl8z3d +tA0Z7qq7fta0Gl24uyuB05dqI5J1LvAzKuWdIjT1tP8qCoxSE/xpix8hX2dt3h+/ +jujUgFPFZ0EVZ0xSyBNRF3MboGZnYXFUxpNjTWPKpagDHJQmqrAcDmWJnMsFY3jS +u1igv3OefnWjSQ== -----END CERTIFICATE----- diff --git a/cli/ssl/.ssl/sub-privkey.pem b/cli/ssl/.ssl/sub-privkey.pem index 68ae61a09..8aef383ec 100644 --- a/cli/ssl/.ssl/sub-privkey.pem +++ b/cli/ssl/.ssl/sub-privkey.pem @@ -1,5 +1,5 @@ -----BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgrfNUSjLV/7j7LSBf -zL/hvGEuv+uvf3/aimqjecO7vcShRANCAATGx0o7t0pSrOoFc+pljtqJVxgaSW+w -9D9C2WdysMeSKKOU+0MzaM4ynLUhETOpBs8E612mdcoeak+G1Emj6UVw +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgcrhROXQT85e+S8h8 +RE3Z7TPo3+WA2RmzJsXJbXkbi5qhRANCAASIrTkZOM4ip42DCyDADXGc7oV3+Oki +myTM3st2RIZWG28rFRwH0LebJV2cduq1HdtlVxIEr+RhvyIL7gllueXU -----END PRIVATE KEY----- diff --git a/go.mod b/go.mod index cb85abbe0..3afbed0a7 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/jackc/pgx/v5 v5.7.2 github.com/lmittmann/tint v1.0.7 github.com/mark3labs/mcp-go v0.41.1 - github.com/nhost/be v0.0.0-20251021065906-8abc7d8dfa48 + github.com/nhost/be v0.0.0-20251106114258-352de15d30f5 github.com/oapi-codegen/runtime v1.1.1 github.com/pb33f/libopenapi v0.21.12 github.com/pelletier/go-toml/v2 v2.2.4 diff --git a/go.sum b/go.sum index 7e05225ad..8438648fc 100644 --- a/go.sum +++ b/go.sum @@ -336,8 +336,8 @@ github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/nhost/be v0.0.0-20251021065906-8abc7d8dfa48 h1:+Oh4Rbr1psWlBaQTakoBYFNB8jBioiXuimNMaNPLTHk= -github.com/nhost/be v0.0.0-20251021065906-8abc7d8dfa48/go.mod h1:feVvqP3dft8hWbp9zNZExdGKbFEYv8aLYohfyAeINNQ= +github.com/nhost/be v0.0.0-20251106114258-352de15d30f5 h1:D1n4dI9LBk6W61/RIQClauPailPHXIp2V7okg6KQMlk= +github.com/nhost/be v0.0.0-20251106114258-352de15d30f5/go.mod h1:5aMnG2R3UQWFLlb3BcA0btBleWIn1ez3pSwg37YthuA= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro= github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg= diff --git a/vendor/github.com/nhost/be/services/mimir/graph/m_insert_run_service_config.go b/vendor/github.com/nhost/be/services/mimir/graph/m_insert_run_service_config.go index 4179d2dbb..25257f748 100644 --- a/vendor/github.com/nhost/be/services/mimir/graph/m_insert_run_service_config.go +++ b/vendor/github.com/nhost/be/services/mimir/graph/m_insert_run_service_config.go @@ -43,6 +43,24 @@ func nameMustBeUnique(svcs Services, serviceID, name string) error { return nil } +func (r *mutationResolver) checkAppLive(ctx context.Context, appID string) error { + appIDUUID, err := uuid.Parse(appID) + if err != nil { + return fmt.Errorf("invalid app ID: %w", err) + } + + desiredState, err := r.nhost.GetAppDesiredState(ctx, appIDUUID) + if err != nil { + return fmt.Errorf("failed to get app desired state: %w", err) + } + + if desiredState != appLive { + return ErrAppMustBeLive + } + + return nil +} + func (r *mutationResolver) insertRunServiceConfig( ctx context.Context, appID string, @@ -58,6 +76,10 @@ func (r *mutationResolver) insertRunServiceConfig( app := r.data[i] + if err := r.checkAppLive(ctx, appID); err != nil { + return nil, err + } + serviceID := uuid.NewString() if _, err := app.IndexService(serviceID); err == nil { diff --git a/vendor/github.com/nhost/be/services/mimir/nhost/db.go b/vendor/github.com/nhost/be/services/mimir/nhost/db.go index 258bd24b6..3ca13087e 100644 --- a/vendor/github.com/nhost/be/services/mimir/nhost/db.go +++ b/vendor/github.com/nhost/be/services/mimir/nhost/db.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.29.0 +// sqlc v1.30.0 package nhost diff --git a/vendor/github.com/nhost/be/services/mimir/nhost/models.go b/vendor/github.com/nhost/be/services/mimir/nhost/models.go index 05ed152fe..905082e05 100644 --- a/vendor/github.com/nhost/be/services/mimir/nhost/models.go +++ b/vendor/github.com/nhost/be/services/mimir/nhost/models.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.29.0 +// sqlc v1.30.0 package nhost @@ -309,6 +309,7 @@ type Deployment struct { CommitUserName pgtype.Text CommitUserAvatarUrl pgtype.Text CommitMessage pgtype.Text + CreatedAt pgtype.Timestamptz } type DeploymentLog struct { diff --git a/vendor/github.com/nhost/be/services/mimir/nhost/querier.go b/vendor/github.com/nhost/be/services/mimir/nhost/querier.go index 1b3ea472d..a2505cb43 100644 --- a/vendor/github.com/nhost/be/services/mimir/nhost/querier.go +++ b/vendor/github.com/nhost/be/services/mimir/nhost/querier.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.29.0 +// sqlc v1.30.0 package nhost diff --git a/vendor/github.com/nhost/be/services/mimir/nhost/query.sql.go b/vendor/github.com/nhost/be/services/mimir/nhost/query.sql.go index 41aa1e48f..2bef2c18a 100644 --- a/vendor/github.com/nhost/be/services/mimir/nhost/query.sql.go +++ b/vendor/github.com/nhost/be/services/mimir/nhost/query.sql.go @@ -1,6 +1,6 @@ // Code generated by sqlc. DO NOT EDIT. // versions: -// sqlc v1.29.0 +// sqlc v1.30.0 // source: query.sql package nhost diff --git a/vendor/github.com/nhost/be/services/mimir/schema/appconfig/hasura_auth.go b/vendor/github.com/nhost/be/services/mimir/schema/appconfig/hasura_auth.go index ccd7d3fbd..084b1a59e 100644 --- a/vendor/github.com/nhost/be/services/mimir/schema/appconfig/hasura_auth.go +++ b/vendor/github.com/nhost/be/services/mimir/schema/appconfig/hasura_auth.go @@ -42,7 +42,11 @@ func IsJWTSecretCompatibleWithHasuraAuth( } func getOauthSettings(c oauthsettings, provider string) []EnvVar { - return []EnvVar{ + if !unptr(c.GetEnabled()) { + return []EnvVar{} + } + + env := []EnvVar{ { Name: fmt.Sprintf("AUTH_PROVIDER_%s_ENABLED", provider), Value: Stringify(unptr(c.GetEnabled())), @@ -61,22 +65,30 @@ func getOauthSettings(c oauthsettings, provider string) []EnvVar { Value: unptr(c.GetClientSecret()), IsSecret: false, }, - { + } + + if c.GetAudience() != nil { + env = append(env, EnvVar{ Name: fmt.Sprintf("AUTH_PROVIDER_%s_AUDIENCE", provider), Value: unptr(c.GetAudience()), IsSecret: false, SecretName: "", - }, - { + }) + } + + if c.GetScope() != nil { + env = append(env, EnvVar{ Name: fmt.Sprintf("AUTH_PROVIDER_%s_SCOPE", provider), Value: Stringify(c.GetScope()), IsSecret: false, SecretName: "", - }, + }) } + + return env } -func HasuraAuthEnv( //nolint:funlen,cyclop,maintidx,gocyclo,gocognit +func HasuraAuthEnv( //nolint:funlen,cyclop,maintidx config *model.ConfigConfig, hasuraGraphqlURL, authServerURL, @@ -584,116 +596,45 @@ func HasuraAuthEnv( //nolint:funlen,cyclop,maintidx,gocyclo,gocognit }...) } - if unptr( - config.GetAuth().GetMethod().GetOauth().GetGithub().GetEnabled(), - ) { - env = append(env, []EnvVar{ - { - Name: "AUTH_PROVIDER_GITHUB_ENABLED", - Value: Stringify( - unptr( - config. - GetAuth(). - GetMethod(). - GetOauth(). - GetGithub(). - GetEnabled(), - ), - ), - IsSecret: false, - SecretName: "", - }, - { - Name: "AUTH_PROVIDER_GITHUB_CLIENT_ID", - Value: unptr( - config. - GetAuth(). - GetMethod(). - GetOauth(). - GetGithub(). - GetClientId(), - ), - IsSecret: false, - SecretName: "", - }, - { - Name: "AUTH_PROVIDER_GITHUB_CLIENT_SECRET", - SecretName: "", - Value: unptr( - config.GetAuth().GetMethod().GetOauth().GetGithub().GetClientSecret(), - ), - IsSecret: false, - }, - }...) - } + env = append(env, getOauthSettings( + config.GetAuth().GetMethod().GetOauth().GetGithub(), + "GITHUB")..., + ) - if unptr( - config.GetAuth().GetMethod().GetOauth().GetGoogle().GetEnabled(), - ) { - env = append(env, getOauthSettings( - config.GetAuth().GetMethod().GetOauth().GetGoogle(), - "GOOGLE")..., - ) - } + env = append(env, getOauthSettings( + config.GetAuth().GetMethod().GetOauth().GetGoogle(), + "GOOGLE")..., + ) - if unptr( - config.GetAuth().GetMethod().GetOauth().GetFacebook().GetEnabled(), - ) { - env = append(env, getOauthSettings( - config.GetAuth().GetMethod().GetOauth().GetFacebook(), - "FACEBOOK")..., - ) - } + env = append(env, getOauthSettings( + config.GetAuth().GetMethod().GetOauth().GetFacebook(), + "FACEBOOK")..., + ) - if unptr( - config.GetAuth().GetMethod().GetOauth().GetSpotify().GetEnabled(), - ) { - env = append(env, getOauthSettings( - config.GetAuth().GetMethod().GetOauth().GetSpotify(), - "SPOTIFY")..., - ) - } + env = append(env, getOauthSettings( + config.GetAuth().GetMethod().GetOauth().GetSpotify(), + "SPOTIFY")..., + ) - if unptr( - config.GetAuth().GetMethod().GetOauth().GetLinkedin().GetEnabled(), - ) { - env = append(env, getOauthSettings( - config.GetAuth().GetMethod().GetOauth().GetLinkedin(), - "LINKEDIN")..., - ) - } + env = append(env, getOauthSettings( + config.GetAuth().GetMethod().GetOauth().GetLinkedin(), + "LINKEDIN")..., + ) - if unptr( - config.GetAuth().GetMethod().GetOauth().GetDiscord().GetEnabled(), - ) { - env = append(env, getOauthSettings( - config.GetAuth().GetMethod().GetOauth().GetDiscord(), - "DISCORD")..., - ) - } + env = append(env, getOauthSettings( + config.GetAuth().GetMethod().GetOauth().GetDiscord(), + "DISCORD")..., + ) - if unptr( - config.GetAuth().GetMethod().GetOauth().GetTwitch().GetEnabled(), - ) { - env = append(env, getOauthSettings( - config.GetAuth().GetMethod().GetOauth().GetTwitch(), - "TWITCH")..., - ) - } + env = append(env, getOauthSettings( + config.GetAuth().GetMethod().GetOauth().GetTwitch(), + "TWITCH")..., + ) - if unptr( - config. - GetAuth(). - GetMethod(). - GetOauth(). - GetWindowslive(). - GetEnabled(), - ) { - env = append(env, getOauthSettings( - config.GetAuth().GetMethod().GetOauth().GetWindowslive(), - "WINDOWS_LIVE")..., - ) - } + env = append(env, getOauthSettings( + config.GetAuth().GetMethod().GetOauth().GetWindowslive(), + "WINDOWS_LIVE")..., + ) if unptr( config.GetAuth().GetMethod().GetOauth().GetWorkos().GetEnabled(), @@ -876,6 +817,17 @@ func HasuraAuthEnv( //nolint:funlen,cyclop,maintidx,gocyclo,gocognit SecretName: "", }, }...) + + if config.GetAuth().GetMethod().GetOauth().GetApple().GetScope() != nil { + env = append(env, EnvVar{ + Name: "AUTH_PROVIDER_APPLE_SCOPE", + Value: Stringify( + config.GetAuth().GetMethod().GetOauth().GetApple().GetScope(), + ), + IsSecret: false, + SecretName: "", + }) + } } if unptr( //nolint:dupl @@ -990,117 +942,15 @@ func HasuraAuthEnv( //nolint:funlen,cyclop,maintidx,gocyclo,gocognit }...) } - if unptr( //nolint:dupl - config.GetAuth().GetMethod().GetOauth().GetGitlab().GetEnabled(), - ) { - env = append(env, []EnvVar{ - { - Name: "AUTH_PROVIDER_GITLAB_ENABLED", - Value: Stringify( - unptr( - config. - GetAuth(). - GetMethod(). - GetOauth(). - GetGitlab(). - GetEnabled(), - ), - ), - IsSecret: false, - SecretName: "", - }, - { - Name: "AUTH_PROVIDER_GITLAB_CLIENT_ID", - Value: unptr( - config. - GetAuth(). - GetMethod(). - GetOauth(). - GetGitlab(). - GetClientId(), - ), - IsSecret: false, - SecretName: "", - }, - { - Name: "AUTH_PROVIDER_GITLAB_CLIENT_SECRET", - SecretName: "", - Value: unptr( - config.GetAuth().GetMethod().GetOauth().GetGitlab().GetClientSecret(), - ), - IsSecret: false, - }, - { - Name: "AUTH_PROVIDER_GITLAB_SCOPE", - Value: Stringify( - config. - GetAuth(). - GetMethod(). - GetOauth(). - GetGitlab(). - GetScope(), - ), - IsSecret: false, - SecretName: "", - }, - }...) - } + env = append(env, getOauthSettings( + config.GetAuth().GetMethod().GetOauth().GetGitlab(), + "GITLAB")..., + ) - if unptr( //nolint:dupl - config.GetAuth().GetMethod().GetOauth().GetStrava().GetEnabled(), - ) { - env = append(env, []EnvVar{ - { - Name: "AUTH_PROVIDER_STRAVA_ENABLED", - Value: Stringify( - unptr( - config. - GetAuth(). - GetMethod(). - GetOauth(). - GetStrava(). - GetEnabled(), - ), - ), - IsSecret: false, - SecretName: "", - }, - { - Name: "AUTH_PROVIDER_STRAVA_CLIENT_ID", - Value: unptr( - config. - GetAuth(). - GetMethod(). - GetOauth(). - GetStrava(). - GetClientId(), - ), - IsSecret: false, - SecretName: "", - }, - { - Name: "AUTH_PROVIDER_STRAVA_CLIENT_SECRET", - SecretName: "", - Value: unptr( - config.GetAuth().GetMethod().GetOauth().GetStrava().GetClientSecret(), - ), - IsSecret: false, - }, - { - Name: "AUTH_PROVIDER_STRAVA_SCOPE", - Value: Stringify( - config. - GetAuth(). - GetMethod(). - GetOauth(). - GetStrava(). - GetScope(), - ), - IsSecret: false, - SecretName: "", - }, - }...) - } + env = append(env, getOauthSettings( + config.GetAuth().GetMethod().GetOauth().GetStrava(), + "STRAVA")..., + ) if unptr( config.GetAuth().GetMethod().GetOauth().GetBitbucket().GetEnabled(), diff --git a/vendor/github.com/nhost/be/services/mimir/schema/schema.cue b/vendor/github.com/nhost/be/services/mimir/schema/schema.cue index 949fdefdf..e751881b6 100644 --- a/vendor/github.com/nhost/be/services/mimir/schema/schema.cue +++ b/vendor/github.com/nhost/be/services/mimir/schema/schema.cue @@ -223,7 +223,7 @@ import ( // Releases: // // https://github.com/nhost/hasura-storage/releases - version: string | *"0.8.2" + version: string | *"0.9.1" // Networking (custom domains at the moment) are not allowed as we need to do further // configurations in the CDN. We will enable it again in the future. @@ -311,7 +311,7 @@ import ( // Releases: // // https://github.com/nhost/hasura-auth/releases - version: string | *"0.42.4" + version: string | *"0.43.0" // Resources for the service resources?: #Resources diff --git a/vendor/github.com/nhost/be/tools/cuegraph/types/int16.go b/vendor/github.com/nhost/be/tools/cuegraph/types/int16.go index 6d201b1b7..76fedcb92 100644 --- a/vendor/github.com/nhost/be/tools/cuegraph/types/int16.go +++ b/vendor/github.com/nhost/be/tools/cuegraph/types/int16.go @@ -1,4 +1,4 @@ -package types //nolint: dupl +package types //nolint: dupl,revive,nolintlint import ( "encoding/json" diff --git a/vendor/modules.txt b/vendor/modules.txt index c761f053c..c147d6848 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -716,8 +716,8 @@ github.com/muesli/termenv # github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 ## explicit github.com/munnerz/goautoneg -# github.com/nhost/be v0.0.0-20251021065906-8abc7d8dfa48 -## explicit; go 1.24.2 +# github.com/nhost/be v0.0.0-20251106114258-352de15d30f5 +## explicit; go 1.25.3 github.com/nhost/be/lib/graphql github.com/nhost/be/lib/graphql/context github.com/nhost/be/lib/graphql/handler