Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove php buildpack config #700

Merged
merged 1 commit into from
Jan 18, 2023
Merged

Remove php buildpack config #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ include_v3
* `nodejs_buildpack_name` [See below](#buildpack-names)
* `go_buildpack_name` [See below](#buildpack-names)
* `python_buildpack_name` [See below](#buildpack-names)
* `php_buildpack_name` [See below](#buildpack-names)
* `r_buildpack_name` [See below](#buildpack-names)
* `binary_buildpack_name` [See below](#buildpack-names)

Expand Down Expand Up @@ -202,7 +201,6 @@ Many tests specify a buildpack when pushing an app, so that on diego the app sta
* `nodejs_buildpack_name: nodejs_buildpack`
* `go_buildpack_name: go_buildpack`
* `python_buildpack_name: python_buildpack`
* `php_buildpack_name: php_buildpack`
* `r_buildpack_name: r_buildpack`
* `binary_buildpack_name: binary_buildpack`
* `hwc_buildpack_name: hwc_buildpack`
Expand Down
1 change: 0 additions & 1 deletion ci/cats.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ With the development of cf-for-k8s, we discovered different behavior in Kubernet
"go_buildpack_name": "paketo-buildpacks/go",
"java_buildpack_name": "paketo-buildpacks/java",
"nodejs_buildpack_name": "paketo-buildpacks/nodejs",
"php_buildpack_name": "paketo-buildpacks/php",
"binary_buildpack_name": "paketo-buildpacks/procfile"
```

Expand Down
1 change: 0 additions & 1 deletion docs/run-on-k8s.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ The sample configuration will run CATS in an apps suite only mode, with addition
"go_buildpack_name": "paketo-buildpacks/go",
"java_buildpack_name": "paketo-buildpacks/java",
"nodejs_buildpack_name": "paketo-buildpacks/nodejs",
"php_buildpack_name": "paketo-buildpacks/php",
"binary_buildpack_name": "paketo-buildpacks/procfile"
}
```
Expand Down
5 changes: 0 additions & 5 deletions helpers/config/config_struct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ type config struct {
JavaBuildpackName *string `json:"java_buildpack_name"`
NginxBuildpackName *string `json:"nginx_buildpack_name"`
NodejsBuildpackName *string `json:"nodejs_buildpack_name"`
PhpBuildpackName *string `json:"php_buildpack_name"`
PythonBuildpackName *string `json:"python_buildpack_name"`
RBuildpackName *string `json:"r_buildpack_name"`
RubyBuildpackName *string `json:"ruby_buildpack_name"`
Expand Down Expand Up @@ -155,7 +154,6 @@ func getDefaults() config {
defaults.JavaBuildpackName = ptrToString("java_buildpack")
defaults.NginxBuildpackName = ptrToString("nginx_buildpack")
defaults.NodejsBuildpackName = ptrToString("nodejs_buildpack")
defaults.PhpBuildpackName = ptrToString("php_buildpack")
defaults.PythonBuildpackName = ptrToString("python_buildpack")
defaults.RBuildpackName = ptrToString("r_buildpack")
defaults.RubyBuildpackName = ptrToString("ruby_buildpack")
Expand Down Expand Up @@ -385,9 +383,6 @@ func validateConfig(config *config) Errors {
if config.NodejsBuildpackName == nil {
errs.Add(fmt.Errorf("* 'nodejs_buildpack_name' must not be null"))
}
if config.PhpBuildpackName == nil {
errs.Add(fmt.Errorf("* 'php_buildpack_name' must not be null"))
}
if config.PythonBuildpackName == nil {
errs.Add(fmt.Errorf("* 'python_buildpack_name' must not be null"))
}
Expand Down
2 changes: 0 additions & 2 deletions helpers/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ type nullConfig struct {
JavaBuildpackName *string `json:"java_buildpack_name"`
NginxBuildpackName *string `json:"nginx_buildpack_name"`
NodejsBuildpackName *string `json:"nodejs_buildpack_name"`
PhpBuildpackName *string `json:"php_buildpack_name"`
PythonBuildpackName *string `json:"python_buildpack_name"`
RBuildpackName *string `json:"r_buildpack_name"`
RubyBuildpackName *string `json:"ruby_buildpack_name"`
Expand Down Expand Up @@ -411,7 +410,6 @@ var _ = Describe("Config", func() {
Expect(err.Error()).To(ContainSubstring("'go_buildpack_name' must not be null"))
Expect(err.Error()).To(ContainSubstring("'java_buildpack_name' must not be null"))
Expect(err.Error()).To(ContainSubstring("'nodejs_buildpack_name' must not be null"))
Expect(err.Error()).To(ContainSubstring("'php_buildpack_name' must not be null"))
Expect(err.Error()).To(ContainSubstring("'python_buildpack_name' must not be null"))
Expect(err.Error()).To(ContainSubstring("'ruby_buildpack_name' must not be null"))
Expect(err.Error()).To(ContainSubstring("'staticfile_buildpack_name' must not be null"))
Expand Down