Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6ef63aace2 | ||
|
|
16daa3d39d |
+12
@@ -14,3 +14,15 @@ examples/*/dist/
|
|||||||
# Provider binaries
|
# Provider binaries
|
||||||
terraform-provider-fission
|
terraform-provider-fission
|
||||||
terraform-provider-fission_*
|
terraform-provider-fission_*
|
||||||
|
/FIX_401_INVOKE.md
|
||||||
|
/deploy/grafana/configmap-datasources.yaml
|
||||||
|
/doc/structure/login-flow.md
|
||||||
|
/doc/thinking/2026-04-15.md
|
||||||
|
/examples/storage-check/deploy.sh
|
||||||
|
/examples/weather-demo/fetcher/main.py
|
||||||
|
/examples/weather-demo/terraform.tfvars.example
|
||||||
|
/s3cfg-ngcloud
|
||||||
|
/scripts/migrate_s3_to_pv.py
|
||||||
|
/token.txt
|
||||||
|
/doc/FIX_401_INVOKE.md
|
||||||
|
/examples/storage-bench-s3-archived/deploy.sh
|
||||||
|
|||||||
@@ -1,473 +0,0 @@
|
|||||||
# Аудит: Terraform Provider vs Fission Canonical CRD
|
|
||||||
|
|
||||||
**Дата:** 2026-06-03
|
|
||||||
**Ветка:** `feat/provider-audit`
|
|
||||||
**Предыдущая версия:** v0.2.4 (ветка `feat/console`)
|
|
||||||
|
|
||||||
## Методология
|
|
||||||
|
|
||||||
Сравнение производилось по трём источникам:
|
|
||||||
1. **Наш код** — `/terraform/provider/internal/resources/*.go` и `/terraform/provider/internal/client/client.go`
|
|
||||||
2. **Fission CRD types.go** — `github.com/fission/fission/pkg/apis/core/v1/types.go` (канонические Go-структуры)
|
|
||||||
3. **Реальные CRD объекты в кластере** — `kubectl get` для environments/packages/functions/httptriggers (наши vs CLI-созданные)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 1. ENVIRONMENT (fission_environment)
|
|
||||||
|
|
||||||
### 1.1 Что у нас
|
|
||||||
|
|
||||||
```go
|
|
||||||
// environmentResourceModel
|
|
||||||
ID, Name, Image, Version(default=3), PoolSize(default=3), Namespace, UID
|
|
||||||
```
|
|
||||||
|
|
||||||
`environmentToUnstructured` генерирует:
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"spec": {
|
|
||||||
"version": 3,
|
|
||||||
"runtime": { "image": "..." },
|
|
||||||
"poolsize": 3
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 1.2 Что делает Fission CLI (`fission env create`)
|
|
||||||
|
|
||||||
Fission CLI (из `environment/create.go`) создает полный `EnvironmentSpec`:
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"spec": {
|
|
||||||
"version": 3,
|
|
||||||
"runtime": {
|
|
||||||
"image": "ghcr.io/fission/python-env",
|
|
||||||
"container": { "name": "env-name", "resources": {} },
|
|
||||||
"podspec": { "containers": [{"name": "env-name", "resources": {}}] }
|
|
||||||
},
|
|
||||||
"builder": {
|
|
||||||
"image": "ghcr.io/fission/go-builder",
|
|
||||||
"command": "build",
|
|
||||||
"container": { "name": "builder", "resources": {} },
|
|
||||||
"podspec": { "containers": [{"name": "builder", "resources": {}}] }
|
|
||||||
},
|
|
||||||
"poolsize": 3,
|
|
||||||
"resources": {},
|
|
||||||
"imagepullsecret": "",
|
|
||||||
"keeparchive": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 1.3 Реальное сравнение в кластере
|
|
||||||
|
|
||||||
| Поле | Наш (tf-python-env) | CLI (python) | Вердикт |
|
|
||||||
|------|---------------------|--------------|---------|
|
|
||||||
| `spec.version` | 3 | 3 | ✅ OK |
|
|
||||||
| `spec.runtime.image` | ✅ | ✅ | ✅ OK |
|
|
||||||
| `spec.runtime.container` | ❌ отсутствует | `{name, resources}` | ⚠️ Fission заполняет defaults — не критично |
|
|
||||||
| `spec.runtime.podspec` | ❌ отсутствует | `{containers}` | ⚠️ Fission заполняет defaults — не критично |
|
|
||||||
| `spec.builder` | ❌ ОТСУТСТВУЕТ | `{image, command, container, podspec}` | 🔴 **КРИТИЧНО для Go** |
|
|
||||||
| `spec.poolsize` | 3 | 3 | ✅ OK |
|
|
||||||
| `spec.resources` | ❌ отсутствует | `{}` | ⚠️ Defaults — не критично |
|
|
||||||
| `spec.imagepullsecret` | ❌ | `""` | ⚠️ Можно добавить позже |
|
|
||||||
| `spec.keeparchive` | ❌ | `false` | ⚠️ Нужно для JVM — не критично сейчас |
|
|
||||||
|
|
||||||
### 1.4 Выводы по Environment
|
|
||||||
|
|
||||||
**Критичный баг:** Невозможно создать environment с builder (нет полей `builder_image`, `builder_command`). Это блокирует Go, любой язык с build step.
|
|
||||||
|
|
||||||
**Что добавить (приоритетно):**
|
|
||||||
- `builder_image` (string, optional) → `spec.builder.image`
|
|
||||||
- `builder_command` (string, optional) → `spec.builder.command`
|
|
||||||
|
|
||||||
**Что можно добавить позже:**
|
|
||||||
- `resources` (object) → `spec.resources`
|
|
||||||
- `imagepullsecret` (string) → `spec.imagepullsecret`
|
|
||||||
- `keeparchive` (bool) → `spec.keeparchive`
|
|
||||||
- `runtime_container_name` — Fission автозаполняет, мы не ставим, k8s принимает без него
|
|
||||||
|
|
||||||
**Что НЕ нужно (Fission автозаполняет):**
|
|
||||||
- `spec.runtime.container`, `spec.runtime.podspec` — заливаются defaults на стороне сервера
|
|
||||||
- `spec.builder.container`, `spec.builder.podspec` — аналогично
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 2. PACKAGE (fission_package)
|
|
||||||
|
|
||||||
### 2.1 Что у нас
|
|
||||||
|
|
||||||
```go
|
|
||||||
// packageResourceModel
|
|
||||||
ID, Name, Environment, SourceDir, CodePath, CodeHash, BuildCmd, Namespace, UID, BuildStatus, BuildLog
|
|
||||||
```
|
|
||||||
|
|
||||||
`packageToUnstructured` генерирует:
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"spec": {
|
|
||||||
"deployment": {
|
|
||||||
"type": "literal",
|
|
||||||
"literal": "base64..."
|
|
||||||
},
|
|
||||||
"environment": { "name": "...", "namespace": "..." },
|
|
||||||
"source": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2.2 Что делает Fission CLI
|
|
||||||
|
|
||||||
Для **deploy-only** (literal):
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"spec": {
|
|
||||||
"deployment": {
|
|
||||||
"type": "literal",
|
|
||||||
"literal": "base64...",
|
|
||||||
"checksum": {}
|
|
||||||
},
|
|
||||||
"environment": { "name": "...", "namespace": "..." },
|
|
||||||
"source": { "checksum": {} }
|
|
||||||
},
|
|
||||||
"status": {
|
|
||||||
"buildstatus": "none"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Для **source-with-builder** (Go, Node с build):
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"spec": {
|
|
||||||
"source": {
|
|
||||||
"type": "literal",
|
|
||||||
"literal": "base64-of-zip...",
|
|
||||||
"checksum": {}
|
|
||||||
},
|
|
||||||
"environment": { "name": "...", "namespace": "..." },
|
|
||||||
"buildcmd": "build"
|
|
||||||
},
|
|
||||||
"status": {
|
|
||||||
"buildstatus": "pending"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Для **large archives** (>256KB):
|
|
||||||
- Загрузка через StorageSvc `/v1/archive` (multipart POST)
|
|
||||||
- В CRD сохраняется `type: "url"`, `url: "http://storagesvc/v1/archive?id=..."`
|
|
||||||
|
|
||||||
### 2.3 Реальное сравнение в кластере
|
|
||||||
|
|
||||||
| Поле | Наш (tf-hello-pkg) | CLI (hello-*) | Вердикт |
|
|
||||||
|------|---------------------|---------------|---------|
|
|
||||||
| `spec.deployment.type` | `"literal"` | `"literal"` | ✅ OK |
|
|
||||||
| `spec.deployment.literal` | ✅ base64 | ✅ base64 | ✅ OK |
|
|
||||||
| `spec.deployment.checksum` | ❌ отсутствует | `{}` | ⚠️ K8s принимает без, но лучше добавить |
|
|
||||||
| `spec.environment` | ✅ | ✅ | ✅ OK |
|
|
||||||
| `spec.source` | `{}` (пустая map) | `{"checksum":{}}` | 🟡 **БАГ**: мы ставим пустой source — не мешает, но мусор |
|
|
||||||
| `spec.buildcmd` | ✅ (если задан) | ✅ | ✅ OK |
|
|
||||||
| `status.buildstatus` | `"none"` (от k8s default) | `"none"` | ✅ OK (k8s сам ставит) |
|
|
||||||
|
|
||||||
### 2.4 Что ОТСУТСТВУЕТ для builder pipeline (Go)
|
|
||||||
|
|
||||||
Для Go-функций нужен **source** package (не deployment):
|
|
||||||
1. Код упаковывается в zip
|
|
||||||
2. zip кодируется в base64 → `spec.source.literal` (если <256KB)
|
|
||||||
3. `spec.source.type` = `"literal"`
|
|
||||||
4. `spec.deployment` = пусто
|
|
||||||
5. `spec.buildcmd` = `"build"` (или пользовательская)
|
|
||||||
6. `status.buildstatus` = `"pending"` → builder собирает → `"succeeded"`/`"failed"`
|
|
||||||
7. После build: `spec.deployment` заполняется builder'ом (url на StorageSvc)
|
|
||||||
|
|
||||||
### 2.5 Выводы по Package
|
|
||||||
|
|
||||||
**Баг (некритичный):** Мы ВСЕГДА ставим `"source": {}` — пустой объект. Fission ставит `"source": {"checksum": {}}`. Оба варианта работают, но чистый вариант — не ставить source вообще если нет source archive.
|
|
||||||
|
|
||||||
**Что добавить (приоритетно):**
|
|
||||||
- **Режим source archive** — для Go и языков с build step. Нужно:
|
|
||||||
- Флаг/переключатель: deployment-only vs source-with-build
|
|
||||||
- Упаковка source_dir в zip → base64 → `spec.source.literal`
|
|
||||||
- Проверка размера <256KB (лимит ArchiveLiteralSizeLimit)
|
|
||||||
- Очистка `spec.deployment` при source mode
|
|
||||||
- `status.buildstatus` = `"pending"` на create
|
|
||||||
|
|
||||||
**Что можно добавить позже:**
|
|
||||||
- StorageSvc загрузка для >256KB архивов
|
|
||||||
- `spec.source.checksum`
|
|
||||||
- Поддержка `type: "url"` (для уже загруженных архивов)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 3. FUNCTION (fission_function)
|
|
||||||
|
|
||||||
### 3.1 Что у нас
|
|
||||||
|
|
||||||
```go
|
|
||||||
// functionResourceModel
|
|
||||||
ID, Name, Environment, PackageName, Entrypoint, Namespace, UID
|
|
||||||
```
|
|
||||||
|
|
||||||
`functionToUnstructured` генерирует:
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"spec": {
|
|
||||||
"environment": { "name": "...", "namespace": "..." },
|
|
||||||
"InvokeStrategy": {
|
|
||||||
"ExecutionStrategy": { "ExecutorType": "poolmgr" },
|
|
||||||
"StrategyType": "execution"
|
|
||||||
},
|
|
||||||
"package": {
|
|
||||||
"packageref": { "name": "...", "namespace": "..." },
|
|
||||||
"functionName": "main.main"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3.2 Что делает Fission CLI (`fission fn create`)
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"spec": {
|
|
||||||
"environment": { "name": "...", "namespace": "..." },
|
|
||||||
"InvokeStrategy": {
|
|
||||||
"ExecutionStrategy": {
|
|
||||||
"ExecutorType": "poolmgr",
|
|
||||||
"MaxScale": 0,
|
|
||||||
"MinScale": 0,
|
|
||||||
"SpecializationTimeout": 120,
|
|
||||||
"TargetCPUPercent": 0
|
|
||||||
},
|
|
||||||
"StrategyType": "execution"
|
|
||||||
},
|
|
||||||
"package": {
|
|
||||||
"packageref": {
|
|
||||||
"name": "...",
|
|
||||||
"namespace": "...",
|
|
||||||
"resourceversion": "6000598"
|
|
||||||
},
|
|
||||||
"functionName": ""
|
|
||||||
},
|
|
||||||
"functionTimeout": 60,
|
|
||||||
"idletimeout": 120,
|
|
||||||
"concurrency": 500,
|
|
||||||
"requestsPerPod": 1,
|
|
||||||
"resources": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3.3 Реальное сравнение в кластере
|
|
||||||
|
|
||||||
| Поле | Наш (tf-hello-fn) | CLI (fn-js-acc) | Вердикт |
|
|
||||||
|------|---------------------|-----------------|---------|
|
|
||||||
| `spec.environment` | ✅ | ✅ | ✅ OK |
|
|
||||||
| `spec.InvokeStrategy.ExecutionStrategy.ExecutorType` | `"poolmgr"` | `"poolmgr"` | ✅ OK |
|
|
||||||
| `spec.InvokeStrategy.ExecutionStrategy.MaxScale` | ❌ отсутствует | `0` | ⚠️ Defaults работают, но лучше ставить |
|
|
||||||
| `spec.InvokeStrategy.ExecutionStrategy.MinScale` | ❌ | `0` | ⚠️ |
|
|
||||||
| `spec.InvokeStrategy.ExecutionStrategy.SpecializationTimeout` | ❌ | `120` | ⚠️ |
|
|
||||||
| `spec.InvokeStrategy.ExecutionStrategy.TargetCPUPercent` | ❌ | `0` | ⚠️ Не критично |
|
|
||||||
| `spec.InvokeStrategy.StrategyType` | `"execution"` | `"execution"` | ✅ OK |
|
|
||||||
| `spec.package.packageref.resourceversion` | ❌ отсутствует | ✅ | 🟡 CLI ставит для оптимизации, мы — нет |
|
|
||||||
| `spec.package.functionName` | ✅ `"main.main"` | `""` (или функция) | ✅ OK |
|
|
||||||
| `spec.functionTimeout` | ❌ | `60` | 🟡 Полезно для управления таймаутами |
|
|
||||||
| `spec.idletimeout` | ❌ | `120` | 🟡 Полезно для scale-to-zero |
|
|
||||||
| `spec.concurrency` | ❌ | `500` | ⚠️ |
|
|
||||||
| `spec.requestsPerPod` | ❌ | `1` | ⚠️ |
|
|
||||||
| `spec.resources` | ❌ | `{}` | ⚠️ |
|
|
||||||
|
|
||||||
### 3.4 Выводы по Function
|
|
||||||
|
|
||||||
**Критичных багов нет.** Наши функции работают, потому что k8s/Fission подставляет defaults. НО:
|
|
||||||
|
|
||||||
**Что добавить (приоритетно):**
|
|
||||||
- `executor_type` (string, optional, default="poolmgr") → для newdeploy/container strategies
|
|
||||||
- `function_timeout` (int, optional) → `spec.functionTimeout` — важно для долгих функций
|
|
||||||
- `idle_timeout` (int, optional) → `spec.idletimeout` — управление scale-to-zero
|
|
||||||
- `min_scale` / `max_scale` (int, optional) → ExecutionStrategy — для newdeploy
|
|
||||||
|
|
||||||
**Что можно добавить позже:**
|
|
||||||
- `concurrency` (int) → `spec.concurrency`
|
|
||||||
- `requests_per_pod` (int) → `spec.requestsPerPod`
|
|
||||||
- `specialization_timeout` (int) → `spec.InvokeStrategy.ExecutionStrategy.SpecializationTimeout`
|
|
||||||
- `resources` (object) → CPU/MEM limits
|
|
||||||
- `secrets`, `configmaps` (list) → volume mounts
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 4. HTTP TRIGGER (fission_http_trigger)
|
|
||||||
|
|
||||||
### 4.1 Что у нас
|
|
||||||
|
|
||||||
```go
|
|
||||||
// httpTriggerResourceModel
|
|
||||||
ID, Name, Function, URL, Methods, CreateIngress, Host, Namespace, UID
|
|
||||||
```
|
|
||||||
|
|
||||||
`httpTriggerToUnstructured` генерирует:
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"spec": {
|
|
||||||
"relativeurl": "/tf-hello",
|
|
||||||
"methods": ["GET"],
|
|
||||||
"functionref": { "type": "name", "name": "tf-hello-fn" },
|
|
||||||
"createingress": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 4.2 Что делает Fission CLI
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"spec": {
|
|
||||||
"relativeurl": "/hello",
|
|
||||||
"methods": ["GET"],
|
|
||||||
"functionref": {
|
|
||||||
"type": "name",
|
|
||||||
"name": "hello",
|
|
||||||
"functionweights": null
|
|
||||||
},
|
|
||||||
"createingress": false,
|
|
||||||
"host": "",
|
|
||||||
"ingressconfig": {
|
|
||||||
"annotations": null,
|
|
||||||
"host": "*",
|
|
||||||
"path": "/hello",
|
|
||||||
"tls": ""
|
|
||||||
},
|
|
||||||
"method": "",
|
|
||||||
"prefix": ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 4.3 Реальное сравнение в кластере
|
|
||||||
|
|
||||||
| Поле | Наш (tf-hello-route) | CLI (hello-route) | Вердикт |
|
|
||||||
|------|----------------------|-------------------|---------|
|
|
||||||
| `spec.relativeurl` | ✅ | ✅ | ✅ OK |
|
|
||||||
| `spec.methods` | ✅ | ✅ | ✅ OK |
|
|
||||||
| `spec.functionref.type` | `"name"` | `"name"` | ✅ OK |
|
|
||||||
| `spec.functionref.name` | ✅ | ✅ | ✅ OK |
|
|
||||||
| `spec.functionref.functionweights` | ❌ | `null` | ✅ Не нужно |
|
|
||||||
| `spec.createingress` | ✅ | ✅ | ✅ OK |
|
|
||||||
| `spec.host` | ❌ (если пусто) | `""` | ✅ Не критично |
|
|
||||||
| `spec.ingressconfig` | Частично (host) | Полный | ⚠️ IngressConfig неполный |
|
|
||||||
| `spec.method` | ❌ | `""` | ✅ Legacy, не нужно |
|
|
||||||
| `spec.prefix` | ❌ | `""` | ⚠️ Для prefix routing — добавить |
|
|
||||||
|
|
||||||
### 4.4 Выводы по HTTPTrigger
|
|
||||||
|
|
||||||
**Багов нет.** Работает корректно. Мелкие расхождения не влияют.
|
|
||||||
|
|
||||||
**Что можно добавить позже:**
|
|
||||||
- `prefix` (string) → `spec.prefix` — для prefix-based routing
|
|
||||||
- `keep_prefix` (bool) → `spec.keepPrefix`
|
|
||||||
- Полный `ingressconfig` (annotations, path, tls) — при `create_ingress=true`
|
|
||||||
- `function_weights` (map) → для canary deployments
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 5. CLIENT (client.go)
|
|
||||||
|
|
||||||
### 5.1 Оценка
|
|
||||||
|
|
||||||
**Код корректный.** Чистый CRUD через `dynamic.Interface`:
|
|
||||||
- 4 GVR определения (environments, packages, functions, httptriggers)
|
|
||||||
- CRUD для каждого: Create/Get/Update/Delete
|
|
||||||
- `IsNotFound()` для обработки 404
|
|
||||||
- `New()` строит config из kubeconfig + context
|
|
||||||
|
|
||||||
**Расхождений с Fission нет** — это наш собственный low-level клиент для работы с CRD.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 6. VALIDATION (validation_helpers.go, entrypoint validation)
|
|
||||||
|
|
||||||
### 6.1 Оценка
|
|
||||||
|
|
||||||
- `ensureEnvironmentExists` — ✅ корректно (проверяет наличие env перед созданием pkg/fn)
|
|
||||||
- `ensurePackageExists` — ✅ корректно
|
|
||||||
- `validateEntrypointAgainstPackageSource` — ⚠️ Проверяет только Python `def funcname(`. Не проверяет:
|
|
||||||
- Node: `module.exports` или `export function`
|
|
||||||
- Go: plugin symbol
|
|
||||||
- PHP: `function handler(`
|
|
||||||
- Ruby: `def handler`
|
|
||||||
|
|
||||||
**Это допустимо** — избыточная валидация может мешать. Лучше валидировать только точно известные паттерны.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 7. СВОДНАЯ ТАБЛИЦА ПРИОРИТЕТОВ
|
|
||||||
|
|
||||||
### 🔴 Критично (блокирует функционал)
|
|
||||||
|
|
||||||
| # | Ресурс | Проблема | Решение |
|
|
||||||
|---|--------|----------|---------|
|
|
||||||
| 1 | Environment | Нет builder support | Добавить `builder_image`, `builder_command` |
|
|
||||||
| 2 | Package | Нет source archive mode | Добавить zip-упаковку source_dir → `spec.source.literal` |
|
|
||||||
|
|
||||||
### 🟡 Важно (улучшает пользовательский опыт)
|
|
||||||
|
|
||||||
| # | Ресурс | Проблема | Решение |
|
|
||||||
|---|--------|----------|---------|
|
|
||||||
| 3 | Function | Захардкожен poolmgr | Добавить `executor_type` с optional default |
|
|
||||||
| 4 | Function | Нет пользовательских таймаутов | Добавить `function_timeout`, `idle_timeout` |
|
|
||||||
| 5 | Function | Нет min/max scale | Добавить `min_scale`, `max_scale` |
|
|
||||||
| 6 | Package | Пустой `source: {}` мусор | Убрать пустой source из payload |
|
|
||||||
|
|
||||||
### ⚪ Не критично (можно позже)
|
|
||||||
|
|
||||||
| # | Ресурс | Проблема |
|
|
||||||
|---|--------|----------|
|
|
||||||
| 7 | Environment | Нет resources, imagepullsecret, keeparchive |
|
|
||||||
| 8 | Function | Нет concurrency, requestsPerPod, resources, secrets, configmaps |
|
|
||||||
| 9 | HTTPTrigger | Нет prefix, keepPrefix, полного ingressconfig |
|
|
||||||
| 10 | Package | Нет StorageSvc загрузки (>256KB) |
|
|
||||||
| 11 | Package | Нет checksum |
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 8. ПЛАН РЕАЛИЗАЦИИ (предлагаемый)
|
|
||||||
|
|
||||||
### Этап 1: Builder support (Environment + Package)
|
|
||||||
|
|
||||||
**environment_resource.go:**
|
|
||||||
- Добавить поля `builder_image` и `builder_command` в модель и schema
|
|
||||||
- Добавить `spec.builder` в `environmentToUnstructured` (если builder_image задан)
|
|
||||||
- Обновить `unstructuredToEnvironmentModel` для чтения builder полей
|
|
||||||
|
|
||||||
**package_resource.go:**
|
|
||||||
- Добавить поле `deploy_type` (string: `"literal"` или `"source"`, default `"literal"`)
|
|
||||||
- При `deploy_type = "source"`: zip source_dir → base64 → `spec.source.literal`, `spec.deployment` пустой
|
|
||||||
- Убрать пустой `"source": {}` при deploy_type = "literal"
|
|
||||||
- Добавить base64 size check (<256KB) при literal mode
|
|
||||||
|
|
||||||
### Этап 2: Function tuning
|
|
||||||
|
|
||||||
**function_resource.go:**
|
|
||||||
- Добавить optional поля: `executor_type`, `function_timeout`, `idle_timeout`, `min_scale`, `max_scale`
|
|
||||||
- Обновить `functionToUnstructured` для заполнения ExecutionStrategy полностью
|
|
||||||
- Обновить `unstructuredToFunctionModel` для чтения новых полей
|
|
||||||
|
|
||||||
### Этап 3: Мелкие улучшения
|
|
||||||
- HTTPTrigger: prefix, keepPrefix
|
|
||||||
- Package: checksum
|
|
||||||
- Environment: resources, imagepullsecret
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## 9. ВЫВОД
|
|
||||||
|
|
||||||
Наш провайдер **работает корректно для основного сценария**: Python/Node/PHP/Ruby/Perl literal deployment + poolmgr executor. Все критические поля (version, runtime.image, poolsize, deployment.literal, functionName, relativeurl, methods) генерируются правильно.
|
|
||||||
|
|
||||||
**Главные пробелы:**
|
|
||||||
1. Нет builder support → Go и любые compiled languages не работают через builder pipeline
|
|
||||||
2. Нет source archive → только deployment-only (literal из одного файла)
|
|
||||||
3. Function executor hardcoded to poolmgr → нет newdeploy/container strategy
|
|
||||||
4. Нет пользовательских таймаутов
|
|
||||||
|
|
||||||
Ни один из пробелов не является **ошибкой** в существующем коде — это **недостающий функционал**. То, что есть, соответствует канону Fission.
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
# Thinking Log — Аудит провайдера, 2026-06-03
|
|
||||||
|
|
||||||
## Задача
|
|
||||||
Тщательное сравнение нашего Terraform provider для Fission с каноническим поведением Fission CLI и CRD types.
|
|
||||||
|
|
||||||
## Что было сделано
|
|
||||||
|
|
||||||
### 1. Чтение нашего кода
|
|
||||||
Прочитаны все 10 .go файлов (~1500 строк):
|
|
||||||
- `environment_resource.go` (136 строк)
|
|
||||||
- `package_resource.go` (460 строк)
|
|
||||||
- `function_resource.go` (350 строк)
|
|
||||||
- `http_trigger_resource.go` (310 строк)
|
|
||||||
- `client.go` (295 строк)
|
|
||||||
- `validation_helpers.go`, `import_helpers.go`
|
|
||||||
- 3 тест-файла
|
|
||||||
|
|
||||||
### 2. Чтение канонических исходников Fission
|
|
||||||
- `pkg/apis/core/v1/types.go` — все CRD Go-структуры
|
|
||||||
- `pkg/apis/core/v1/const.go` — константы (ArchiveLiteralSizeLimit=256KB, BuildStatus*, ExecutorType*)
|
|
||||||
- CLI: `environment/create.go`, `package/create.go`, `package/util/util.go`
|
|
||||||
- StorageSvc: `storagesvc/client/client.go`
|
|
||||||
|
|
||||||
### 3. Дамп реальных CRD из кластера
|
|
||||||
Через kubectl получены ВСЕ объекты всех 4 типов из кластера:
|
|
||||||
- 20+ environments (наши tf-* и CLI-созданные)
|
|
||||||
- 15+ functions (наши tf-* и CLI-созданные)
|
|
||||||
- 15+ packages (наши и CLI)
|
|
||||||
- 15+ httptriggers
|
|
||||||
|
|
||||||
### 4. Сравнительный анализ
|
|
||||||
Для каждого ресурса: поле-за-полем наш payload vs CLI payload vs канон types.go.
|
|
||||||
|
|
||||||
## Ключевые находки
|
|
||||||
|
|
||||||
### Что правильно
|
|
||||||
- environment: version, runtime.image, poolsize — ок
|
|
||||||
- package: deployment.literal base64 — ок
|
|
||||||
- function: InvokeStrategy structure, package.functionName — ок
|
|
||||||
- httptrigger: relativeurl, methods, functionref, createingress — ок
|
|
||||||
- client.go: чистый CRUD, GVR правильные — ок
|
|
||||||
|
|
||||||
### Что отсутствует (критично)
|
|
||||||
1. **Environment.builder** — нет builder_image/builder_command → Go не работает через builder pipeline
|
|
||||||
2. **Package source archive** — только deployment-only, нет source+build flow
|
|
||||||
|
|
||||||
### Что отсутствует (важно)
|
|
||||||
3. **Function executor_type** — hardcoded poolmgr, нет newdeploy/container
|
|
||||||
4. **Function timeouts** — нет functionTimeout, idleTimeout
|
|
||||||
5. **Function scaling** — нет minScale, maxScale
|
|
||||||
|
|
||||||
### Что отсутствует (некритично)
|
|
||||||
6. Package: пустой `source: {}` — мусор но не bug
|
|
||||||
7. Environment: resources, imagepullsecret, keeparchive
|
|
||||||
8. Function: concurrency, requestsPerPod, resources, secrets
|
|
||||||
9. HTTPTrigger: prefix, keepPrefix, полный ingressconfig
|
|
||||||
|
|
||||||
## Решение
|
|
||||||
Написан полный аудит-документ: `doc/AUDIT_PROVIDER_VS_FISSION_2026-06-03.md`
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
def good_function():
|
|
||||||
return "correct"
|
|
||||||
|
|
||||||
def main():
|
|
||||||
return "this is main"
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
fission = {
|
|
||||||
source = "nail/fission"
|
|
||||||
version = "~> 0.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "fission" {
|
|
||||||
kubeconfig_path = "/home/naeel/.kube/config"
|
|
||||||
namespace = "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_environment" "python" {
|
|
||||||
name = "tf-bad-entry-env"
|
|
||||||
image = "ghcr.io/fission/python-env"
|
|
||||||
version = 3
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_package" "pkg" {
|
|
||||||
name = "tf-bad-entry-pkg"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
source_dir = "${path.module}/code"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_function" "fn" {
|
|
||||||
name = "tf-bad-entry-fn"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
package_name = fission_package.pkg.name
|
|
||||||
entrypoint = "main.nonexistent_function" # Wrong entrypoint
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_http_trigger" "route" {
|
|
||||||
name = "tf-bad-entry-route"
|
|
||||||
url = "/bad-entrypoint"
|
|
||||||
methods = ["GET"]
|
|
||||||
function = fission_function.fn.name
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
def fib(n):
|
|
||||||
if n <= 1:
|
|
||||||
return n
|
|
||||||
return fib(n-1) + fib(n-2)
|
|
||||||
|
|
||||||
def main():
|
|
||||||
return f"fib(100)={fib(100)}"
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
fission = {
|
|
||||||
source = "nail/fission"
|
|
||||||
version = "~> 0.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "fission" {
|
|
||||||
kubeconfig_path = "/home/naeel/.kube/config"
|
|
||||||
namespace = "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_environment" "python" {
|
|
||||||
name = "tf-deep-recursion-env"
|
|
||||||
image = "ghcr.io/fission/python-env"
|
|
||||||
version = 3
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_package" "pkg" {
|
|
||||||
name = "tf-deep-recursion-pkg"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
source_dir = "${path.module}/code"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_function" "fn" {
|
|
||||||
name = "tf-deep-recursion-fn"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
package_name = fission_package.pkg.name
|
|
||||||
entrypoint = "main.main"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_http_trigger" "route" {
|
|
||||||
name = "tf-deep-recursion-route"
|
|
||||||
function = fission_function.fn.name
|
|
||||||
url = "/deep-recursion"
|
|
||||||
methods = ["GET"]
|
|
||||||
}
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
def main(): return "env-1"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
def main(): return "env-2"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
def main(): return "env-3"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
def main(): return "env-4"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
def main(): return "env-5"
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
def main(): return "v10"
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
fission = {
|
|
||||||
source = "nail/fission"
|
|
||||||
version = "~> 0.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "fission" {
|
|
||||||
kubeconfig_path = "/home/naeel/.kube/config"
|
|
||||||
namespace = "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_environment" "python" {
|
|
||||||
name = "tf-freq-update-env"
|
|
||||||
image = "ghcr.io/fission/python-env"
|
|
||||||
version = 3
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_package" "pkg" {
|
|
||||||
name = "tf-freq-update-pkg"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
source_dir = "${path.module}/code"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_function" "fn" {
|
|
||||||
name = "tf-freq-update-fn"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
package_name = fission_package.pkg.name
|
|
||||||
entrypoint = "main.main"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_http_trigger" "route" {
|
|
||||||
name = "tf-freq-update-route"
|
|
||||||
function = fission_function.fn.name
|
|
||||||
url = "/freq-update"
|
|
||||||
methods = ["GET"]
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
def main():
|
|
||||||
return "test"
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
fission = {
|
|
||||||
source = "nail/fission"
|
|
||||||
version = "~> 0.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "fission" {
|
|
||||||
kubeconfig_path = "/home/naeel/.kube/config"
|
|
||||||
namespace = "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Missing image — should fail
|
|
||||||
resource "fission_environment" "bad_env" {
|
|
||||||
name = "tf-invalid-env"
|
|
||||||
# image = "..." # MISSING REQUIRED FIELD
|
|
||||||
version = 3
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_package" "pkg" {
|
|
||||||
name = "tf-invalid-pkg"
|
|
||||||
environment = fission_environment.bad_env.name
|
|
||||||
source_dir = "${path.module}/code"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_function" "fn" {
|
|
||||||
name = "tf-invalid-fn"
|
|
||||||
environment = fission_environment.bad_env.name
|
|
||||||
package_name = fission_package.pkg.name
|
|
||||||
entrypoint = "main.main"
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
def main():
|
|
||||||
return "test"
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
fission = {
|
|
||||||
source = "nail/fission"
|
|
||||||
version = "~> 0.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "fission" {
|
|
||||||
kubeconfig_path = "/home/naeel/.kube/config"
|
|
||||||
namespace = "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_http_trigger" "route" {
|
|
||||||
name = "tf-missing-ref-route"
|
|
||||||
url = "/missing-ref"
|
|
||||||
methods = ["GET"]
|
|
||||||
function = "tf-missing-ref-fn"
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
def main():
|
|
||||||
return "env-1"
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
def main():
|
|
||||||
return "env-2"
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
def main():
|
|
||||||
return "env-3"
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
import nonexistent_module_xyz_12345
|
|
||||||
|
|
||||||
def main():
|
|
||||||
return nonexistent_module_xyz_12345.do_something()
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
fission = {
|
|
||||||
source = "nail/fission"
|
|
||||||
version = "~> 0.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "fission" {
|
|
||||||
kubeconfig_path = "/home/naeel/.kube/config"
|
|
||||||
namespace = "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_environment" "python" {
|
|
||||||
name = "tf-neg-badimport-env"
|
|
||||||
image = "ghcr.io/fission/python-env"
|
|
||||||
version = 3
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_package" "pkg" {
|
|
||||||
name = "tf-neg-badimport-pkg"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
source_dir = "${path.module}/code"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_function" "fn" {
|
|
||||||
name = "tf-neg-badimport-fn"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
package_name = fission_package.pkg.name
|
|
||||||
entrypoint = "main.main"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_http_trigger" "route" {
|
|
||||||
name = "tf-neg-badimport-route"
|
|
||||||
function = fission_function.fn.name
|
|
||||||
url = "/neg/badimport"
|
|
||||||
methods = ["GET"]
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
fission = {
|
|
||||||
source = "nail/fission"
|
|
||||||
version = "~> 0.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "fission" {
|
|
||||||
kubeconfig_path = "/home/naeel/.kube/config"
|
|
||||||
namespace = "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Пытаемся создать environment с именем, которое уже существует (tf-python-env из hello-python)
|
|
||||||
resource "fission_environment" "conflict" {
|
|
||||||
name = "tf-python-env"
|
|
||||||
image = "ghcr.io/fission/python-env"
|
|
||||||
version = 3
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
def not_main():
|
|
||||||
return "there is no main() here, Fission will fail to invoke"
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
fission = {
|
|
||||||
source = "nail/fission"
|
|
||||||
version = "~> 0.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "fission" {
|
|
||||||
kubeconfig_path = "/home/naeel/.kube/config"
|
|
||||||
namespace = "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_environment" "python" {
|
|
||||||
name = "tf-neg-nomain-env"
|
|
||||||
image = "ghcr.io/fission/python-env"
|
|
||||||
version = 3
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_package" "pkg" {
|
|
||||||
name = "tf-neg-nomain-pkg"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
source_dir = "${path.module}/code"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_function" "fn" {
|
|
||||||
name = "tf-neg-nomain-fn"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
package_name = fission_package.pkg.name
|
|
||||||
entrypoint = "main.main"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_http_trigger" "route" {
|
|
||||||
name = "tf-neg-nomain-route"
|
|
||||||
function = fission_function.fn.name
|
|
||||||
url = "/neg/nomain"
|
|
||||||
methods = ["GET"]
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
def main():
|
|
||||||
x = 1 / 0
|
|
||||||
return f"result: {x}"
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
fission = {
|
|
||||||
source = "nail/fission"
|
|
||||||
version = "~> 0.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "fission" {
|
|
||||||
kubeconfig_path = "/home/naeel/.kube/config"
|
|
||||||
namespace = "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_environment" "python" {
|
|
||||||
name = "tf-neg-rterr-env"
|
|
||||||
image = "ghcr.io/fission/python-env"
|
|
||||||
version = 3
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_package" "pkg" {
|
|
||||||
name = "tf-neg-rterr-pkg"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
source_dir = "${path.module}/code"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_function" "fn" {
|
|
||||||
name = "tf-neg-rterr-fn"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
package_name = fission_package.pkg.name
|
|
||||||
entrypoint = "main.main"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_http_trigger" "route" {
|
|
||||||
name = "tf-neg-rterr-route"
|
|
||||||
function = fission_function.fn.name
|
|
||||||
url = "/neg/rterr"
|
|
||||||
methods = ["GET"]
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
def main(:
|
|
||||||
return "this should never work"
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
fission = {
|
|
||||||
source = "nail/fission"
|
|
||||||
version = "~> 0.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "fission" {
|
|
||||||
kubeconfig_path = "/home/naeel/.kube/config"
|
|
||||||
namespace = "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_environment" "python" {
|
|
||||||
name = "tf-neg-syntax-env"
|
|
||||||
image = "ghcr.io/fission/python-env"
|
|
||||||
version = 3
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_package" "pkg" {
|
|
||||||
name = "tf-neg-syntax-pkg"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
source_dir = "${path.module}/code"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_function" "fn" {
|
|
||||||
name = "tf-neg-syntax-fn"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
package_name = fission_package.pkg.name
|
|
||||||
entrypoint = "main.main"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_http_trigger" "route" {
|
|
||||||
name = "tf-neg-syntax-route"
|
|
||||||
function = fission_function.fn.name
|
|
||||||
url = "/neg/syntax"
|
|
||||||
methods = ["GET"]
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
def main():
|
|
||||||
return "orphan-test"
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
fission = {
|
|
||||||
source = "nail/fission"
|
|
||||||
version = "~> 0.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "fission" {
|
|
||||||
kubeconfig_path = "/home/naeel/.kube/config"
|
|
||||||
namespace = "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_environment" "python" {
|
|
||||||
name = "tf-orphan-env"
|
|
||||||
image = "ghcr.io/fission/python-env"
|
|
||||||
version = 3
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_package" "pkg" {
|
|
||||||
name = "tf-orphan-pkg"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
source_dir = "${path.module}/code"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_function" "fn" {
|
|
||||||
name = "tf-orphan-fn"
|
|
||||||
environment = fission_environment.python.name
|
|
||||||
package_name = fission_package.pkg.name
|
|
||||||
entrypoint = "main.main"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_http_trigger" "route" {
|
|
||||||
name = "tf-orphan-route"
|
|
||||||
function = fission_function.fn.name
|
|
||||||
url = "/orphan-test"
|
|
||||||
methods = ["GET"]
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
def exists():
|
|
||||||
return "x"
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
fission = {
|
|
||||||
source = "nail/fission"
|
|
||||||
version = "~> 0.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "fission" {
|
|
||||||
kubeconfig_path = "/home/naeel/.kube/config"
|
|
||||||
namespace = "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_environment" "env" {
|
|
||||||
name = "tf-validate-bad-entry-env"
|
|
||||||
image = "ghcr.io/fission/python-env"
|
|
||||||
version = 3
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_package" "pkg" {
|
|
||||||
name = "tf-validate-bad-entry-pkg"
|
|
||||||
environment = fission_environment.env.name
|
|
||||||
source_dir = "${path.module}/code"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_function" "fn" {
|
|
||||||
name = "tf-validate-bad-entry-fn"
|
|
||||||
environment = fission_environment.env.name
|
|
||||||
package_name = fission_package.pkg.name
|
|
||||||
entrypoint = "main.main"
|
|
||||||
}
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
def main():
|
|
||||||
return "x"
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
fission = {
|
|
||||||
source = "nail/fission"
|
|
||||||
version = "~> 0.1.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "fission" {
|
|
||||||
kubeconfig_path = "/home/naeel/.kube/config"
|
|
||||||
namespace = "default"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "fission_package" "pkg" {
|
|
||||||
name = "tf-validate-missing-env-pkg"
|
|
||||||
environment = "env-does-not-exist-xyz"
|
|
||||||
source_dir = "${path.module}/code"
|
|
||||||
}
|
|
||||||
@@ -24,15 +24,13 @@ type EnvironmentResource struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
type environmentResourceModel struct {
|
type environmentResourceModel struct {
|
||||||
ID types.String `tfsdk:"id"`
|
ID types.String `tfsdk:"id"`
|
||||||
Name types.String `tfsdk:"name"`
|
Name types.String `tfsdk:"name"`
|
||||||
Image types.String `tfsdk:"image"`
|
Image types.String `tfsdk:"image"`
|
||||||
Version types.Int64 `tfsdk:"version"`
|
Version types.Int64 `tfsdk:"version"`
|
||||||
PoolSize types.Int64 `tfsdk:"poolsize"`
|
PoolSize types.Int64 `tfsdk:"poolsize"`
|
||||||
BuilderImage types.String `tfsdk:"builder_image"`
|
Namespace types.String `tfsdk:"namespace"`
|
||||||
BuilderCommand types.String `tfsdk:"builder_command"`
|
UID types.String `tfsdk:"uid"`
|
||||||
Namespace types.String `tfsdk:"namespace"`
|
|
||||||
UID types.String `tfsdk:"uid"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewEnvironmentResource() resource.Resource {
|
func NewEnvironmentResource() resource.Resource {
|
||||||
@@ -70,14 +68,6 @@ func (r *EnvironmentResource) Schema(_ context.Context, _ resource.SchemaRequest
|
|||||||
Default: int64default.StaticInt64(3),
|
Default: int64default.StaticInt64(3),
|
||||||
Description: "Размер пула pre-warmed контейнеров.",
|
Description: "Размер пула pre-warmed контейнеров.",
|
||||||
},
|
},
|
||||||
"builder_image": schema.StringAttribute{
|
|
||||||
Optional: true,
|
|
||||||
Description: "Builder image для Environment (например ghcr.io/fission/go-builder). Нужен для языков с build step (Go и др.).",
|
|
||||||
},
|
|
||||||
"builder_command": schema.StringAttribute{
|
|
||||||
Optional: true,
|
|
||||||
Description: "Команда сборки в builder контейнере (например 'build').",
|
|
||||||
},
|
|
||||||
"namespace": schema.StringAttribute{
|
"namespace": schema.StringAttribute{
|
||||||
Optional: true,
|
Optional: true,
|
||||||
Computed: true,
|
Computed: true,
|
||||||
@@ -226,26 +216,6 @@ func (r *EnvironmentResource) ImportState(ctx context.Context, req resource.Impo
|
|||||||
|
|
||||||
// environmentToUnstructured преобразует Terraform model в Kubernetes CRD payload.
|
// environmentToUnstructured преобразует Terraform model в Kubernetes CRD payload.
|
||||||
func environmentToUnstructured(model environmentResourceModel, namespace string) *unstructured.Unstructured {
|
func environmentToUnstructured(model environmentResourceModel, namespace string) *unstructured.Unstructured {
|
||||||
spec := map[string]interface{}{
|
|
||||||
"version": model.Version.ValueInt64(),
|
|
||||||
"runtime": map[string]interface{}{
|
|
||||||
"image": model.Image.ValueString(),
|
|
||||||
},
|
|
||||||
"poolsize": model.PoolSize.ValueInt64(),
|
|
||||||
}
|
|
||||||
|
|
||||||
builderImage := model.BuilderImage.ValueString()
|
|
||||||
if builderImage != "" {
|
|
||||||
builder := map[string]interface{}{
|
|
||||||
"image": builderImage,
|
|
||||||
}
|
|
||||||
builderCmd := model.BuilderCommand.ValueString()
|
|
||||||
if builderCmd != "" {
|
|
||||||
builder["command"] = builderCmd
|
|
||||||
}
|
|
||||||
spec["builder"] = builder
|
|
||||||
}
|
|
||||||
|
|
||||||
return &unstructured.Unstructured{Object: map[string]interface{}{
|
return &unstructured.Unstructured{Object: map[string]interface{}{
|
||||||
"apiVersion": "fission.io/v1",
|
"apiVersion": "fission.io/v1",
|
||||||
"kind": "Environment",
|
"kind": "Environment",
|
||||||
@@ -253,7 +223,13 @@ func environmentToUnstructured(model environmentResourceModel, namespace string)
|
|||||||
"name": model.Name.ValueString(),
|
"name": model.Name.ValueString(),
|
||||||
"namespace": namespace,
|
"namespace": namespace,
|
||||||
},
|
},
|
||||||
"spec": spec,
|
"spec": map[string]interface{}{
|
||||||
|
"version": model.Version.ValueInt64(),
|
||||||
|
"runtime": map[string]interface{}{
|
||||||
|
"image": model.Image.ValueString(),
|
||||||
|
},
|
||||||
|
"poolsize": model.PoolSize.ValueInt64(),
|
||||||
|
},
|
||||||
}}
|
}}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -262,8 +238,6 @@ func unstructuredToEnvironmentModel(environmentObject *unstructured.Unstructured
|
|||||||
imageValue, _, _ := unstructured.NestedString(environmentObject.Object, "spec", "runtime", "image")
|
imageValue, _, _ := unstructured.NestedString(environmentObject.Object, "spec", "runtime", "image")
|
||||||
versionValue, _, _ := unstructured.NestedInt64(environmentObject.Object, "spec", "version")
|
versionValue, _, _ := unstructured.NestedInt64(environmentObject.Object, "spec", "version")
|
||||||
poolsizeValue, _, _ := unstructured.NestedInt64(environmentObject.Object, "spec", "poolsize")
|
poolsizeValue, _, _ := unstructured.NestedInt64(environmentObject.Object, "spec", "poolsize")
|
||||||
builderImage, _, _ := unstructured.NestedString(environmentObject.Object, "spec", "builder", "image")
|
|
||||||
builderCommand, _, _ := unstructured.NestedString(environmentObject.Object, "spec", "builder", "command")
|
|
||||||
|
|
||||||
state := base
|
state := base
|
||||||
state.Name = types.StringValue(environmentObject.GetName())
|
state.Name = types.StringValue(environmentObject.GetName())
|
||||||
@@ -280,12 +254,6 @@ func unstructuredToEnvironmentModel(environmentObject *unstructured.Unstructured
|
|||||||
if poolsizeValue != 0 {
|
if poolsizeValue != 0 {
|
||||||
state.PoolSize = types.Int64Value(poolsizeValue)
|
state.PoolSize = types.Int64Value(poolsizeValue)
|
||||||
}
|
}
|
||||||
if builderImage != "" {
|
|
||||||
state.BuilderImage = types.StringValue(builderImage)
|
|
||||||
}
|
|
||||||
if builderCommand != "" {
|
|
||||||
state.BuilderCommand = types.StringValue(builderCommand)
|
|
||||||
}
|
|
||||||
|
|
||||||
return state
|
return state
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"github.com/hashicorp/terraform-plugin-framework/types"
|
"github.com/hashicorp/terraform-plugin-framework/types"
|
||||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestEnvironmentToUnstructuredAndBack(t *testing.T) {
|
func TestEnvironmentToUnstructuredAndBack(t *testing.T) {
|
||||||
@@ -34,51 +33,3 @@ func TestEnvironmentToUnstructuredAndBack(t *testing.T) {
|
|||||||
t.Fatalf("unexpected poolsize: %d", state.PoolSize.ValueInt64())
|
t.Fatalf("unexpected poolsize: %d", state.PoolSize.ValueInt64())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestEnvironmentToUnstructuredWithBuilder(t *testing.T) {
|
|
||||||
input := environmentResourceModel{
|
|
||||||
Name: types.StringValue("go-env"),
|
|
||||||
Image: types.StringValue("ghcr.io/fission/go-env"),
|
|
||||||
Version: types.Int64Value(3),
|
|
||||||
PoolSize: types.Int64Value(3),
|
|
||||||
BuilderImage: types.StringValue("ghcr.io/fission/go-builder"),
|
|
||||||
BuilderCommand: types.StringValue("build"),
|
|
||||||
}
|
|
||||||
|
|
||||||
obj := environmentToUnstructured(input, "default")
|
|
||||||
state := unstructuredToEnvironmentModel(obj, input)
|
|
||||||
|
|
||||||
if state.BuilderImage.ValueString() != "ghcr.io/fission/go-builder" {
|
|
||||||
t.Fatalf("unexpected builder_image: %q", state.BuilderImage.ValueString())
|
|
||||||
}
|
|
||||||
if state.BuilderCommand.ValueString() != "build" {
|
|
||||||
t.Fatalf("unexpected builder_command: %q", state.BuilderCommand.ValueString())
|
|
||||||
}
|
|
||||||
|
|
||||||
// Verify the unstructured object has builder section
|
|
||||||
builderImage, found, _ := unstructured.NestedString(obj.Object, "spec", "builder", "image")
|
|
||||||
if !found || builderImage != "ghcr.io/fission/go-builder" {
|
|
||||||
t.Fatalf("builder.image not set correctly in unstructured: %q", builderImage)
|
|
||||||
}
|
|
||||||
builderCmd, found, _ := unstructured.NestedString(obj.Object, "spec", "builder", "command")
|
|
||||||
if !found || builderCmd != "build" {
|
|
||||||
t.Fatalf("builder.command not set correctly in unstructured: %q", builderCmd)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestEnvironmentToUnstructuredWithoutBuilder(t *testing.T) {
|
|
||||||
input := environmentResourceModel{
|
|
||||||
Name: types.StringValue("py-env"),
|
|
||||||
Image: types.StringValue("ghcr.io/fission/python-env"),
|
|
||||||
Version: types.Int64Value(3),
|
|
||||||
PoolSize: types.Int64Value(3),
|
|
||||||
}
|
|
||||||
|
|
||||||
obj := environmentToUnstructured(input, "default")
|
|
||||||
|
|
||||||
// Verify no builder section when builder_image is not set
|
|
||||||
_, found, _ := unstructured.NestedString(obj.Object, "spec", "builder", "image")
|
|
||||||
if found {
|
|
||||||
t.Fatalf("builder should not be present when builder_image is not set")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ import (
|
|||||||
"github.com/hashicorp/terraform-plugin-framework/path"
|
"github.com/hashicorp/terraform-plugin-framework/path"
|
||||||
"github.com/hashicorp/terraform-plugin-framework/resource"
|
"github.com/hashicorp/terraform-plugin-framework/resource"
|
||||||
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
|
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
|
||||||
"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault"
|
|
||||||
"github.com/hashicorp/terraform-plugin-framework/types"
|
"github.com/hashicorp/terraform-plugin-framework/types"
|
||||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||||
|
|
||||||
@@ -27,18 +26,13 @@ type FunctionResource struct {
|
|||||||
|
|
||||||
// functionResourceModel описывает состояние terraform ресурса fission_function.
|
// functionResourceModel описывает состояние terraform ресурса fission_function.
|
||||||
type functionResourceModel struct {
|
type functionResourceModel struct {
|
||||||
ID types.String `tfsdk:"id"`
|
ID types.String `tfsdk:"id"`
|
||||||
Name types.String `tfsdk:"name"`
|
Name types.String `tfsdk:"name"`
|
||||||
Environment types.String `tfsdk:"environment"`
|
Environment types.String `tfsdk:"environment"`
|
||||||
PackageName types.String `tfsdk:"package_name"`
|
PackageName types.String `tfsdk:"package_name"`
|
||||||
Entrypoint types.String `tfsdk:"entrypoint"`
|
Entrypoint types.String `tfsdk:"entrypoint"`
|
||||||
ExecutorType types.String `tfsdk:"executor_type"`
|
Namespace types.String `tfsdk:"namespace"`
|
||||||
FunctionTimeout types.Int64 `tfsdk:"function_timeout"`
|
UID types.String `tfsdk:"uid"`
|
||||||
IdleTimeout types.Int64 `tfsdk:"idle_timeout"`
|
|
||||||
MinScale types.Int64 `tfsdk:"min_scale"`
|
|
||||||
MaxScale types.Int64 `tfsdk:"max_scale"`
|
|
||||||
Namespace types.String `tfsdk:"namespace"`
|
|
||||||
UID types.String `tfsdk:"uid"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewFunctionResource создает инстанс ресурса функции.
|
// NewFunctionResource создает инстанс ресурса функции.
|
||||||
@@ -75,28 +69,6 @@ func (r *FunctionResource) Schema(_ context.Context, _ resource.SchemaRequest, r
|
|||||||
Required: true,
|
Required: true,
|
||||||
Description: "Имя точки входа в пакете (например main.main).",
|
Description: "Имя точки входа в пакете (например main.main).",
|
||||||
},
|
},
|
||||||
"executor_type": schema.StringAttribute{
|
|
||||||
Optional: true,
|
|
||||||
Computed: true,
|
|
||||||
Default: stringdefault.StaticString("poolmgr"),
|
|
||||||
Description: "Тип executor: poolmgr (default), newdeploy или container.",
|
|
||||||
},
|
|
||||||
"function_timeout": schema.Int64Attribute{
|
|
||||||
Optional: true,
|
|
||||||
Description: "Таймаут выполнения функции в секундах (Fission default: 60).",
|
|
||||||
},
|
|
||||||
"idle_timeout": schema.Int64Attribute{
|
|
||||||
Optional: true,
|
|
||||||
Description: "Время простоя до scale-to-zero в секундах (Fission default: 120).",
|
|
||||||
},
|
|
||||||
"min_scale": schema.Int64Attribute{
|
|
||||||
Optional: true,
|
|
||||||
Description: "Минимальное число реплик (для newdeploy/container).",
|
|
||||||
},
|
|
||||||
"max_scale": schema.Int64Attribute{
|
|
||||||
Optional: true,
|
|
||||||
Description: "Максимальное число реплик (для newdeploy/container).",
|
|
||||||
},
|
|
||||||
"namespace": schema.StringAttribute{
|
"namespace": schema.StringAttribute{
|
||||||
Optional: true,
|
Optional: true,
|
||||||
Computed: true,
|
Computed: true,
|
||||||
@@ -263,46 +235,6 @@ func (r *FunctionResource) ImportState(ctx context.Context, req resource.ImportS
|
|||||||
|
|
||||||
// functionToUnstructured преобразует Terraform model в Kubernetes CRD payload.
|
// functionToUnstructured преобразует Terraform model в Kubernetes CRD payload.
|
||||||
func functionToUnstructured(model functionResourceModel, namespace string) *unstructured.Unstructured {
|
func functionToUnstructured(model functionResourceModel, namespace string) *unstructured.Unstructured {
|
||||||
executorType := "poolmgr"
|
|
||||||
if !model.ExecutorType.IsNull() && !model.ExecutorType.IsUnknown() && model.ExecutorType.ValueString() != "" {
|
|
||||||
executorType = model.ExecutorType.ValueString()
|
|
||||||
}
|
|
||||||
|
|
||||||
executionStrategy := map[string]interface{}{
|
|
||||||
"ExecutorType": executorType,
|
|
||||||
}
|
|
||||||
if !model.MinScale.IsNull() && !model.MinScale.IsUnknown() {
|
|
||||||
executionStrategy["MinScale"] = model.MinScale.ValueInt64()
|
|
||||||
}
|
|
||||||
if !model.MaxScale.IsNull() && !model.MaxScale.IsUnknown() {
|
|
||||||
executionStrategy["MaxScale"] = model.MaxScale.ValueInt64()
|
|
||||||
}
|
|
||||||
|
|
||||||
spec := map[string]interface{}{
|
|
||||||
"environment": map[string]interface{}{
|
|
||||||
"name": model.Environment.ValueString(),
|
|
||||||
"namespace": namespace,
|
|
||||||
},
|
|
||||||
"InvokeStrategy": map[string]interface{}{
|
|
||||||
"ExecutionStrategy": executionStrategy,
|
|
||||||
"StrategyType": "execution",
|
|
||||||
},
|
|
||||||
"package": map[string]interface{}{
|
|
||||||
"packageref": map[string]interface{}{
|
|
||||||
"name": model.PackageName.ValueString(),
|
|
||||||
"namespace": namespace,
|
|
||||||
},
|
|
||||||
"functionName": model.Entrypoint.ValueString(),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
if !model.FunctionTimeout.IsNull() && !model.FunctionTimeout.IsUnknown() {
|
|
||||||
spec["functionTimeout"] = model.FunctionTimeout.ValueInt64()
|
|
||||||
}
|
|
||||||
if !model.IdleTimeout.IsNull() && !model.IdleTimeout.IsUnknown() {
|
|
||||||
spec["idletimeout"] = model.IdleTimeout.ValueInt64()
|
|
||||||
}
|
|
||||||
|
|
||||||
return &unstructured.Unstructured{Object: map[string]interface{}{
|
return &unstructured.Unstructured{Object: map[string]interface{}{
|
||||||
"apiVersion": "fission.io/v1",
|
"apiVersion": "fission.io/v1",
|
||||||
"kind": "Function",
|
"kind": "Function",
|
||||||
@@ -310,7 +242,25 @@ func functionToUnstructured(model functionResourceModel, namespace string) *unst
|
|||||||
"name": model.Name.ValueString(),
|
"name": model.Name.ValueString(),
|
||||||
"namespace": namespace,
|
"namespace": namespace,
|
||||||
},
|
},
|
||||||
"spec": spec,
|
"spec": map[string]interface{}{
|
||||||
|
"environment": map[string]interface{}{
|
||||||
|
"name": model.Environment.ValueString(),
|
||||||
|
"namespace": namespace,
|
||||||
|
},
|
||||||
|
"InvokeStrategy": map[string]interface{}{
|
||||||
|
"ExecutionStrategy": map[string]interface{}{
|
||||||
|
"ExecutorType": "poolmgr",
|
||||||
|
},
|
||||||
|
"StrategyType": "execution",
|
||||||
|
},
|
||||||
|
"package": map[string]interface{}{
|
||||||
|
"packageref": map[string]interface{}{
|
||||||
|
"name": model.PackageName.ValueString(),
|
||||||
|
"namespace": namespace,
|
||||||
|
},
|
||||||
|
"functionName": model.Entrypoint.ValueString(),
|
||||||
|
},
|
||||||
|
},
|
||||||
}}
|
}}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -319,11 +269,6 @@ func unstructuredToFunctionModel(functionObject *unstructured.Unstructured, base
|
|||||||
environmentName, _, _ := unstructured.NestedString(functionObject.Object, "spec", "environment", "name")
|
environmentName, _, _ := unstructured.NestedString(functionObject.Object, "spec", "environment", "name")
|
||||||
packageName, _, _ := unstructured.NestedString(functionObject.Object, "spec", "package", "packageref", "name")
|
packageName, _, _ := unstructured.NestedString(functionObject.Object, "spec", "package", "packageref", "name")
|
||||||
entrypoint, _, _ := unstructured.NestedString(functionObject.Object, "spec", "package", "functionName")
|
entrypoint, _, _ := unstructured.NestedString(functionObject.Object, "spec", "package", "functionName")
|
||||||
executorType, _, _ := unstructured.NestedString(functionObject.Object, "spec", "InvokeStrategy", "ExecutionStrategy", "ExecutorType")
|
|
||||||
functionTimeout, foundFT, _ := unstructured.NestedInt64(functionObject.Object, "spec", "functionTimeout")
|
|
||||||
idleTimeout, foundIT, _ := unstructured.NestedInt64(functionObject.Object, "spec", "idletimeout")
|
|
||||||
minScale, foundMin, _ := unstructured.NestedInt64(functionObject.Object, "spec", "InvokeStrategy", "ExecutionStrategy", "MinScale")
|
|
||||||
maxScale, foundMax, _ := unstructured.NestedInt64(functionObject.Object, "spec", "InvokeStrategy", "ExecutionStrategy", "MaxScale")
|
|
||||||
|
|
||||||
state := base
|
state := base
|
||||||
state.Name = types.StringValue(functionObject.GetName())
|
state.Name = types.StringValue(functionObject.GetName())
|
||||||
@@ -340,21 +285,6 @@ func unstructuredToFunctionModel(functionObject *unstructured.Unstructured, base
|
|||||||
if entrypoint != "" {
|
if entrypoint != "" {
|
||||||
state.Entrypoint = types.StringValue(entrypoint)
|
state.Entrypoint = types.StringValue(entrypoint)
|
||||||
}
|
}
|
||||||
if executorType != "" {
|
|
||||||
state.ExecutorType = types.StringValue(executorType)
|
|
||||||
}
|
|
||||||
if foundFT {
|
|
||||||
state.FunctionTimeout = types.Int64Value(functionTimeout)
|
|
||||||
}
|
|
||||||
if foundIT {
|
|
||||||
state.IdleTimeout = types.Int64Value(idleTimeout)
|
|
||||||
}
|
|
||||||
if foundMin {
|
|
||||||
state.MinScale = types.Int64Value(minScale)
|
|
||||||
}
|
|
||||||
if foundMax {
|
|
||||||
state.MaxScale = types.Int64Value(maxScale)
|
|
||||||
}
|
|
||||||
|
|
||||||
return state
|
return state
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,9 +31,6 @@ func TestFunctionToUnstructuredAndBack(t *testing.T) {
|
|||||||
if state.Entrypoint.ValueString() != "main.main" {
|
if state.Entrypoint.ValueString() != "main.main" {
|
||||||
t.Fatalf("unexpected entrypoint: %q", state.Entrypoint.ValueString())
|
t.Fatalf("unexpected entrypoint: %q", state.Entrypoint.ValueString())
|
||||||
}
|
}
|
||||||
if state.ExecutorType.ValueString() != "poolmgr" {
|
|
||||||
t.Fatalf("unexpected executor_type: %q", state.ExecutorType.ValueString())
|
|
||||||
}
|
|
||||||
|
|
||||||
invoke, found, err := unstructured.NestedMap(obj.Object, "spec", "InvokeStrategy")
|
invoke, found, err := unstructured.NestedMap(obj.Object, "spec", "InvokeStrategy")
|
||||||
if err != nil || !found || len(invoke) == 0 {
|
if err != nil || !found || len(invoke) == 0 {
|
||||||
@@ -41,45 +38,6 @@ func TestFunctionToUnstructuredAndBack(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestFunctionToUnstructuredWithTimeouts(t *testing.T) {
|
|
||||||
input := functionResourceModel{
|
|
||||||
Name: types.StringValue("fn-b"),
|
|
||||||
Environment: types.StringValue("env-a"),
|
|
||||||
PackageName: types.StringValue("pkg-a"),
|
|
||||||
Entrypoint: types.StringValue("main.main"),
|
|
||||||
ExecutorType: types.StringValue("newdeploy"),
|
|
||||||
FunctionTimeout: types.Int64Value(120),
|
|
||||||
IdleTimeout: types.Int64Value(60),
|
|
||||||
MinScale: types.Int64Value(1),
|
|
||||||
MaxScale: types.Int64Value(5),
|
|
||||||
}
|
|
||||||
|
|
||||||
obj := functionToUnstructured(input, "default")
|
|
||||||
state := unstructuredToFunctionModel(obj, input)
|
|
||||||
|
|
||||||
if state.ExecutorType.ValueString() != "newdeploy" {
|
|
||||||
t.Fatalf("unexpected executor_type: %q", state.ExecutorType.ValueString())
|
|
||||||
}
|
|
||||||
if state.FunctionTimeout.ValueInt64() != 120 {
|
|
||||||
t.Fatalf("unexpected function_timeout: %d", state.FunctionTimeout.ValueInt64())
|
|
||||||
}
|
|
||||||
if state.IdleTimeout.ValueInt64() != 60 {
|
|
||||||
t.Fatalf("unexpected idle_timeout: %d", state.IdleTimeout.ValueInt64())
|
|
||||||
}
|
|
||||||
if state.MinScale.ValueInt64() != 1 {
|
|
||||||
t.Fatalf("unexpected min_scale: %d", state.MinScale.ValueInt64())
|
|
||||||
}
|
|
||||||
if state.MaxScale.ValueInt64() != 5 {
|
|
||||||
t.Fatalf("unexpected max_scale: %d", state.MaxScale.ValueInt64())
|
|
||||||
}
|
|
||||||
|
|
||||||
// Verify executor type in unstructured
|
|
||||||
et, _, _ := unstructured.NestedString(obj.Object, "spec", "InvokeStrategy", "ExecutionStrategy", "ExecutorType")
|
|
||||||
if et != "newdeploy" {
|
|
||||||
t.Fatalf("unexpected ExecutorType in unstructured: %q", et)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestValidateEntrypointAgainstPackageSourcePythonOK(t *testing.T) {
|
func TestValidateEntrypointAgainstPackageSourcePythonOK(t *testing.T) {
|
||||||
source := "def main():\n return 'ok'\n"
|
source := "def main():\n return 'ok'\n"
|
||||||
pkg := &unstructured.Unstructured{Object: map[string]interface{}{
|
pkg := &unstructured.Unstructured{Object: map[string]interface{}{
|
||||||
|
|||||||
@@ -1,13 +1,10 @@
|
|||||||
package resources
|
package resources
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"archive/zip"
|
|
||||||
"bytes"
|
|
||||||
"context"
|
"context"
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
@@ -15,7 +12,6 @@ import (
|
|||||||
"github.com/hashicorp/terraform-plugin-framework/path"
|
"github.com/hashicorp/terraform-plugin-framework/path"
|
||||||
"github.com/hashicorp/terraform-plugin-framework/resource"
|
"github.com/hashicorp/terraform-plugin-framework/resource"
|
||||||
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
|
"github.com/hashicorp/terraform-plugin-framework/resource/schema"
|
||||||
"github.com/hashicorp/terraform-plugin-framework/resource/schema/stringdefault"
|
|
||||||
"github.com/hashicorp/terraform-plugin-framework/types"
|
"github.com/hashicorp/terraform-plugin-framework/types"
|
||||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||||
|
|
||||||
@@ -41,7 +37,6 @@ type packageResourceModel struct {
|
|||||||
CodePath types.String `tfsdk:"code_path"`
|
CodePath types.String `tfsdk:"code_path"`
|
||||||
CodeHash types.String `tfsdk:"code_hash"`
|
CodeHash types.String `tfsdk:"code_hash"`
|
||||||
BuildCmd types.String `tfsdk:"build_command"`
|
BuildCmd types.String `tfsdk:"build_command"`
|
||||||
DeployType types.String `tfsdk:"deploy_type"`
|
|
||||||
Namespace types.String `tfsdk:"namespace"`
|
Namespace types.String `tfsdk:"namespace"`
|
||||||
UID types.String `tfsdk:"uid"`
|
UID types.String `tfsdk:"uid"`
|
||||||
BuildStatus types.String `tfsdk:"build_status"`
|
BuildStatus types.String `tfsdk:"build_status"`
|
||||||
@@ -91,12 +86,6 @@ func (r *PackageResource) Schema(_ context.Context, _ resource.SchemaRequest, re
|
|||||||
Optional: true,
|
Optional: true,
|
||||||
Description: "Команда сборки пакета в Fission.",
|
Description: "Команда сборки пакета в Fission.",
|
||||||
},
|
},
|
||||||
"deploy_type": schema.StringAttribute{
|
|
||||||
Optional: true,
|
|
||||||
Computed: true,
|
|
||||||
Default: stringdefault.StaticString("literal"),
|
|
||||||
Description: "Тип деплоя: 'literal' (default) — код в deployment.literal, 'source' — код в source.literal (для Go и языков с build step).",
|
|
||||||
},
|
|
||||||
"namespace": schema.StringAttribute{
|
"namespace": schema.StringAttribute{
|
||||||
Optional: true,
|
Optional: true,
|
||||||
Computed: true,
|
Computed: true,
|
||||||
@@ -148,7 +137,7 @@ func (r *PackageResource) ModifyPlan(ctx context.Context, req resource.ModifyPla
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
literalBytes, err := loadPackageContent(plan.SourceDir.ValueString(), plan.CodePath.ValueString(), plan.DeployType.ValueString())
|
literalBytes, err := loadPackageLiteral(plan.SourceDir.ValueString(), plan.CodePath.ValueString())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
resp.Diagnostics.AddError("Ошибка чтения исходного кода пакета", err.Error())
|
resp.Diagnostics.AddError("Ошибка чтения исходного кода пакета", err.Error())
|
||||||
return
|
return
|
||||||
@@ -194,7 +183,7 @@ func (r *PackageResource) Create(ctx context.Context, req resource.CreateRequest
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
literalBytes, err := loadPackageContent(plan.SourceDir.ValueString(), plan.CodePath.ValueString(), plan.DeployType.ValueString())
|
literalBytes, err := loadPackageLiteral(plan.SourceDir.ValueString(), plan.CodePath.ValueString())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
resp.Diagnostics.AddError("Ошибка чтения исходного кода пакета", err.Error())
|
resp.Diagnostics.AddError("Ошибка чтения исходного кода пакета", err.Error())
|
||||||
return
|
return
|
||||||
@@ -257,7 +246,7 @@ func (r *PackageResource) Update(ctx context.Context, req resource.UpdateRequest
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
literalBytes, err := loadPackageContent(plan.SourceDir.ValueString(), plan.CodePath.ValueString(), plan.DeployType.ValueString())
|
literalBytes, err := loadPackageLiteral(plan.SourceDir.ValueString(), plan.CodePath.ValueString())
|
||||||
if err != nil {
|
if err != nil {
|
||||||
resp.Diagnostics.AddError("Ошибка чтения исходного кода пакета", err.Error())
|
resp.Diagnostics.AddError("Ошибка чтения исходного кода пакета", err.Error())
|
||||||
return
|
return
|
||||||
@@ -340,7 +329,7 @@ func resolveNamespace(resourceNamespace types.String, providerNamespace string)
|
|||||||
return namespace
|
return namespace
|
||||||
}
|
}
|
||||||
|
|
||||||
// loadPackageLiteral читает bytes для literal deployment (один файл).
|
// loadPackageLiteral читает bytes для spec.deployment.literal.
|
||||||
func loadPackageLiteral(sourceDir, codePath string) ([]byte, error) {
|
func loadPackageLiteral(sourceDir, codePath string) ([]byte, error) {
|
||||||
if sourceDir != "" {
|
if sourceDir != "" {
|
||||||
mainFilePath, err := resolveMainSourceFile(sourceDir)
|
mainFilePath, err := resolveMainSourceFile(sourceDir)
|
||||||
@@ -364,57 +353,6 @@ func loadPackageLiteral(sourceDir, codePath string) ([]byte, error) {
|
|||||||
return literalBytes, nil
|
return literalBytes, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// loadPackageSourceArchive создает zip-архив из source_dir для builder pipeline.
|
|
||||||
func loadPackageSourceArchive(sourceDir string) ([]byte, error) {
|
|
||||||
var buf bytes.Buffer
|
|
||||||
zipWriter := zip.NewWriter(&buf)
|
|
||||||
|
|
||||||
err := filepath.Walk(sourceDir, func(path string, info os.FileInfo, err error) error {
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if info.IsDir() {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
relPath, err := filepath.Rel(sourceDir, path)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("compute relative path for %q: %w", path, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
writer, err := zipWriter.Create(relPath)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("create zip entry %q: %w", relPath, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
file, err := os.Open(path)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("open file %q: %w", path, err)
|
|
||||||
}
|
|
||||||
defer file.Close()
|
|
||||||
|
|
||||||
_, err = io.Copy(writer, file)
|
|
||||||
return err
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("zip source_dir %q: %w", sourceDir, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := zipWriter.Close(); err != nil {
|
|
||||||
return nil, fmt.Errorf("close zip writer: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return buf.Bytes(), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// loadPackageContent загружает содержимое пакета в зависимости от deploy_type.
|
|
||||||
func loadPackageContent(sourceDir, codePath, deployType string) ([]byte, error) {
|
|
||||||
if deployType == "source" && sourceDir != "" {
|
|
||||||
return loadPackageSourceArchive(sourceDir)
|
|
||||||
}
|
|
||||||
return loadPackageLiteral(sourceDir, codePath)
|
|
||||||
}
|
|
||||||
|
|
||||||
// resolveMainSourceFile выбирает основной файл исходника из source_dir.
|
// resolveMainSourceFile выбирает основной файл исходника из source_dir.
|
||||||
func resolveMainSourceFile(sourceDir string) (string, error) {
|
func resolveMainSourceFile(sourceDir string) (string, error) {
|
||||||
candidates := []string{"main.py", "main.js", "main.go", "main.php", "main.rb", "main.pl"}
|
candidates := []string{"main.py", "main.js", "main.go", "main.php", "main.rb", "main.pl"}
|
||||||
@@ -433,36 +371,6 @@ func resolveMainSourceFile(sourceDir string) (string, error) {
|
|||||||
func packageToUnstructured(model packageResourceModel, namespace string, literalBytes []byte) *unstructured.Unstructured {
|
func packageToUnstructured(model packageResourceModel, namespace string, literalBytes []byte) *unstructured.Unstructured {
|
||||||
literalSource := base64.StdEncoding.EncodeToString(literalBytes)
|
literalSource := base64.StdEncoding.EncodeToString(literalBytes)
|
||||||
|
|
||||||
deployType := "literal"
|
|
||||||
if !model.DeployType.IsNull() && !model.DeployType.IsUnknown() && model.DeployType.ValueString() != "" {
|
|
||||||
deployType = model.DeployType.ValueString()
|
|
||||||
}
|
|
||||||
|
|
||||||
spec := map[string]interface{}{
|
|
||||||
"environment": map[string]interface{}{
|
|
||||||
"name": model.Environment.ValueString(),
|
|
||||||
"namespace": namespace,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
if deployType == "source" {
|
|
||||||
// Source mode: код в spec.source (для builder pipeline — Go и др.)
|
|
||||||
spec["source"] = map[string]interface{}{
|
|
||||||
"type": "literal",
|
|
||||||
"literal": literalSource,
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// Literal/deployment mode: код в spec.deployment (Python, Node, PHP, Ruby, Perl)
|
|
||||||
spec["deployment"] = map[string]interface{}{
|
|
||||||
"type": "literal",
|
|
||||||
"literal": literalSource,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if buildCommand := model.BuildCmd.ValueString(); buildCommand != "" {
|
|
||||||
spec["buildcmd"] = buildCommand
|
|
||||||
}
|
|
||||||
|
|
||||||
object := map[string]interface{}{
|
object := map[string]interface{}{
|
||||||
"apiVersion": "fission.io/v1",
|
"apiVersion": "fission.io/v1",
|
||||||
"kind": "Package",
|
"kind": "Package",
|
||||||
@@ -470,7 +378,21 @@ func packageToUnstructured(model packageResourceModel, namespace string, literal
|
|||||||
"name": model.Name.ValueString(),
|
"name": model.Name.ValueString(),
|
||||||
"namespace": namespace,
|
"namespace": namespace,
|
||||||
},
|
},
|
||||||
"spec": spec,
|
"spec": map[string]interface{}{
|
||||||
|
"deployment": map[string]interface{}{
|
||||||
|
"type": "literal",
|
||||||
|
"literal": literalSource,
|
||||||
|
},
|
||||||
|
"environment": map[string]interface{}{
|
||||||
|
"name": model.Environment.ValueString(),
|
||||||
|
"namespace": namespace,
|
||||||
|
},
|
||||||
|
"source": map[string]interface{}{},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
if buildCommand := model.BuildCmd.ValueString(); buildCommand != "" {
|
||||||
|
_ = unstructured.SetNestedField(object, buildCommand, "spec", "buildcmd")
|
||||||
}
|
}
|
||||||
|
|
||||||
return &unstructured.Unstructured{Object: object}
|
return &unstructured.Unstructured{Object: object}
|
||||||
@@ -483,7 +405,6 @@ func unstructuredToPackageModel(packageObject *unstructured.Unstructured, base p
|
|||||||
buildStatus, _, _ := unstructured.NestedString(packageObject.Object, "status", "buildstatus")
|
buildStatus, _, _ := unstructured.NestedString(packageObject.Object, "status", "buildstatus")
|
||||||
buildLog, _, _ := unstructured.NestedString(packageObject.Object, "status", "buildlog")
|
buildLog, _, _ := unstructured.NestedString(packageObject.Object, "status", "buildlog")
|
||||||
deploymentLiteral, _, _ := unstructured.NestedString(packageObject.Object, "spec", "deployment", "literal")
|
deploymentLiteral, _, _ := unstructured.NestedString(packageObject.Object, "spec", "deployment", "literal")
|
||||||
sourceLiteral, _, _ := unstructured.NestedString(packageObject.Object, "spec", "source", "literal")
|
|
||||||
|
|
||||||
state := packageResourceModel{
|
state := packageResourceModel{
|
||||||
ID: types.StringValue(fmt.Sprintf("%s/%s", packageObject.GetNamespace(), packageObject.GetName())),
|
ID: types.StringValue(fmt.Sprintf("%s/%s", packageObject.GetNamespace(), packageObject.GetName())),
|
||||||
@@ -493,7 +414,6 @@ func unstructuredToPackageModel(packageObject *unstructured.Unstructured, base p
|
|||||||
CodePath: base.CodePath,
|
CodePath: base.CodePath,
|
||||||
CodeHash: base.CodeHash,
|
CodeHash: base.CodeHash,
|
||||||
BuildCmd: base.BuildCmd,
|
BuildCmd: base.BuildCmd,
|
||||||
DeployType: base.DeployType,
|
|
||||||
Namespace: types.StringValue(packageObject.GetNamespace()),
|
Namespace: types.StringValue(packageObject.GetNamespace()),
|
||||||
UID: types.StringValue(string(packageObject.GetUID())),
|
UID: types.StringValue(string(packageObject.GetUID())),
|
||||||
BuildStatus: types.StringNull(),
|
BuildStatus: types.StringNull(),
|
||||||
@@ -513,13 +433,8 @@ func unstructuredToPackageModel(packageObject *unstructured.Unstructured, base p
|
|||||||
state.BuildLog = types.StringValue(buildLog)
|
state.BuildLog = types.StringValue(buildLog)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Определить hash из содержимого (deployment или source)
|
if deploymentLiteral != "" {
|
||||||
literalForHash := deploymentLiteral
|
if literalBytes, err := base64.StdEncoding.DecodeString(deploymentLiteral); err == nil {
|
||||||
if literalForHash == "" {
|
|
||||||
literalForHash = sourceLiteral
|
|
||||||
}
|
|
||||||
if literalForHash != "" {
|
|
||||||
if literalBytes, err := base64.StdEncoding.DecodeString(literalForHash); err == nil {
|
|
||||||
state.CodeHash = types.StringValue(calculateCodeHash(literalBytes))
|
state.CodeHash = types.StringValue(calculateCodeHash(literalBytes))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package resources
|
package resources
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"archive/zip"
|
|
||||||
"bytes"
|
|
||||||
"context"
|
"context"
|
||||||
"crypto/sha256"
|
"crypto/sha256"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
@@ -106,47 +104,6 @@ func TestPackageToUnstructured(t *testing.T) {
|
|||||||
if string(decoded) != "print('hi')" {
|
if string(decoded) != "print('hi')" {
|
||||||
t.Fatalf("unexpected decoded literal: %q", string(decoded))
|
t.Fatalf("unexpected decoded literal: %q", string(decoded))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Verify no empty source map is generated
|
|
||||||
_, sourceFound, _ := unstructured.NestedMap(obj.Object, "spec", "source")
|
|
||||||
if sourceFound {
|
|
||||||
t.Fatalf("empty source should not be present in deployment mode")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestPackageToUnstructuredSourceMode(t *testing.T) {
|
|
||||||
input := packageResourceModel{
|
|
||||||
Name: types.StringValue("pkg-go"),
|
|
||||||
Environment: types.StringValue("go-env"),
|
|
||||||
DeployType: types.StringValue("source"),
|
|
||||||
BuildCmd: types.StringValue("build"),
|
|
||||||
}
|
|
||||||
|
|
||||||
obj := packageToUnstructured(input, "default", []byte("zip-content"))
|
|
||||||
sourceLiteral, found, err := unstructured.NestedString(obj.Object, "spec", "source", "literal")
|
|
||||||
if err != nil || !found {
|
|
||||||
t.Fatalf("source.literal not found")
|
|
||||||
}
|
|
||||||
|
|
||||||
decoded, err := base64.StdEncoding.DecodeString(sourceLiteral)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("decode source literal: %v", err)
|
|
||||||
}
|
|
||||||
if string(decoded) != "zip-content" {
|
|
||||||
t.Fatalf("unexpected source literal: %q", string(decoded))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Verify no deployment section in source mode
|
|
||||||
_, deployFound, _ := unstructured.NestedMap(obj.Object, "spec", "deployment")
|
|
||||||
if deployFound {
|
|
||||||
t.Fatalf("deployment should not be present in source mode")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Verify buildcmd is set
|
|
||||||
buildCmd, _, _ := unstructured.NestedString(obj.Object, "spec", "buildcmd")
|
|
||||||
if buildCmd != "build" {
|
|
||||||
t.Fatalf("unexpected buildcmd: %q", buildCmd)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestResolveNamespace(t *testing.T) {
|
func TestResolveNamespace(t *testing.T) {
|
||||||
@@ -222,39 +179,3 @@ func TestHTTPTriggerRoundTrip(t *testing.T) {
|
|||||||
t.Fatalf("unexpected url: %q", state.URL.ValueString())
|
t.Fatalf("unexpected url: %q", state.URL.ValueString())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestLoadPackageSourceArchive(t *testing.T) {
|
|
||||||
tempDir := t.TempDir()
|
|
||||||
// Create multiple files to zip
|
|
||||||
files := map[string]string{
|
|
||||||
"main.go": "package main\n\nimport \"net/http\"\n\nfunc Handler(w http.ResponseWriter, r *http.Request) {}\n",
|
|
||||||
"go.mod": "module example.com/fn\n\ngo 1.21\n",
|
|
||||||
}
|
|
||||||
for name, content := range files {
|
|
||||||
if err := os.WriteFile(filepath.Join(tempDir, name), []byte(content), 0o600); err != nil {
|
|
||||||
t.Fatalf("write %s: %v", name, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
zipBytes, err := loadPackageSourceArchive(tempDir)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("loadPackageSourceArchive error: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Verify it's a valid zip
|
|
||||||
reader, err := zip.NewReader(bytes.NewReader(zipBytes), int64(len(zipBytes)))
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("invalid zip: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
foundFiles := map[string]bool{}
|
|
||||||
for _, f := range reader.File {
|
|
||||||
foundFiles[f.Name] = true
|
|
||||||
}
|
|
||||||
if !foundFiles["main.go"] {
|
|
||||||
t.Fatalf("main.go not found in zip")
|
|
||||||
}
|
|
||||||
if !foundFiles["go.mod"] {
|
|
||||||
t.Fatalf("go.mod not found in zip")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user