Skip to content

Commit

Permalink
fix fabric8io#4106: removing listing from projectrequests
Browse files Browse the repository at this point in the history
this allows for the removal of projectrequestsoperationimpl
  • Loading branch information
shawkins committed Apr 28, 2022
1 parent 20f7b6b commit 1c31544
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 171 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#### Bugs
* Fix #3832 #1883: simplifying the isHttpsAvailable check
* Fix #3745: the client will throw better exceptions when a namespace is not discernible for an operation
* Fix #4106: removed listing from projectrequests
* Fix #4081: moving Versionable.withResourceVersion to a method on WatchAndWaitable and removing Waitable from the return type

#### Improvements
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import io.fabric8.kubernetes.api.model.IntOrString;
import io.fabric8.kubernetes.api.model.LabelSelector;
import io.fabric8.kubernetes.api.model.LocalObjectReference;
import io.fabric8.kubernetes.api.model.Namespaced;
import io.fabric8.kubernetes.api.model.ObjectReference;
import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
import io.fabric8.kubernetes.api.model.PodTemplateSpec;
Expand Down Expand Up @@ -58,7 +57,7 @@
})
@Version("v1")
@Group("project.openshift.io")
public class ProjectRequest implements HasMetadata, Namespaced
public class ProjectRequest implements HasMetadata
{

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12600,8 +12600,7 @@
"additionalProperties": true,
"javaType": "io.fabric8.openshift.api.model.ProjectRequest",
"javaInterfaces": [
"io.fabric8.kubernetes.api.model.HasMetadata",
"io.fabric8.kubernetes.api.model.Namespaced"
"io.fabric8.kubernetes.api.model.HasMetadata"
]
},
"os_project_ProjectSpec": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12600,8 +12600,7 @@
"additionalProperties": true,
"javaType": "io.fabric8.openshift.api.model.ProjectRequest",
"javaInterfaces": [
"io.fabric8.kubernetes.api.model.HasMetadata",
"io.fabric8.kubernetes.api.model.Namespaced"
"io.fabric8.kubernetes.api.model.HasMetadata"
]
},
"os_project_ProjectSpec": {
Expand Down
1 change: 1 addition & 0 deletions kubernetes-model-generator/pkg/schemagen/generate.go
Original file line number Diff line number Diff line change
Expand Up @@ -710,6 +710,7 @@ func (g *schemaGenerator) isClusterScopedResource(t reflect.Type) bool {
"github.com/openshift/api/user/v1/Identity",
"github.com/openshift/api/apiserver/v1/APIRequestCount",
"github.com/openshift/api/project/v1/Project",
"github.com/openshift/api/project/v1/ProjectRequest",
"github.com/openshift/api/user/v1/Group",
"github.com/openshift/api/user/v1/User",
"github.com/openshift/api/oauth/v1/OAuthAccessToken",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

package io.fabric8.openshift.client.server.mock;

import io.fabric8.kubernetes.api.model.Status;
import io.fabric8.kubernetes.api.model.StatusBuilder;
import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.fabric8.openshift.api.model.ProjectRequest;
import io.fabric8.openshift.api.model.ProjectRequestBuilder;
import io.fabric8.openshift.client.OpenShiftClient;
Expand All @@ -26,26 +26,15 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;

@EnableOpenShiftMockClient
@EnableKubernetesMockClient
class ProjectRequestTest {

OpenShiftMockServer server;
KubernetesMockServer server;
OpenShiftClient client;

@Test
void testList() {
server.expect().withPath("/apis/project.openshift.io/v1/projectrequests").andReturn(200, new StatusBuilder().withMessage("success").build()).once();

Status status = client.projectrequests().list();
assertNotNull(status);
assertEquals("success", status.getMessage());
}



@Test
void testCreate() {
ProjectRequest req1 = new ProjectRequestBuilder().withApiVersion("v1").withNewMetadata().withName("req1").and().build();
ProjectRequest req1 = new ProjectRequestBuilder().withApiVersion("project.openshift.io/v1").withNewMetadata().withName("req1").and().build();

server.expect().withPath("/apis/project.openshift.io/v1/projectrequests").andReturn(201, req1).once();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,9 @@
*/
package io.fabric8.openshift.client.dsl;

import io.fabric8.kubernetes.api.model.Status;
import io.fabric8.kubernetes.client.dsl.InOutCreateable;
import io.fabric8.kubernetes.client.dsl.Listable;
import io.fabric8.openshift.api.model.ProjectRequest;

public interface ProjectRequestOperation extends
InOutCreateable<ProjectRequest, ProjectRequest>,
Listable<Status> {
InOutCreateable<ProjectRequest, ProjectRequest> {
}
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
import io.fabric8.openshift.api.model.PodSecurityPolicyReview;
import io.fabric8.openshift.api.model.PodSecurityPolicySelfSubjectReview;
import io.fabric8.openshift.api.model.PodSecurityPolicySubjectReview;
import io.fabric8.openshift.api.model.ProjectRequest;
import io.fabric8.openshift.api.model.RangeAllocation;
import io.fabric8.openshift.api.model.RangeAllocationList;
import io.fabric8.openshift.api.model.ResourceAccessReview;
Expand Down Expand Up @@ -161,7 +162,6 @@
import io.fabric8.openshift.client.dsl.ProjectOperation;
import io.fabric8.openshift.client.dsl.ProjectRequestOperation;
import io.fabric8.openshift.client.dsl.TemplateResource;
import io.fabric8.openshift.client.dsl.internal.ProjectRequestsOperationImpl;
import io.fabric8.openshift.client.dsl.internal.apps.DeploymentConfigOperationsImpl;
import io.fabric8.openshift.client.dsl.internal.authorization.RoleBindingOperationsImpl;
import io.fabric8.openshift.client.dsl.internal.build.BuildConfigOperationsImpl;
Expand Down Expand Up @@ -468,7 +468,16 @@ public NonNamespaceOperation<SecurityContextConstraints, SecurityContextConstrai

@Override
public ProjectRequestOperation projectrequests() {
return new ProjectRequestsOperationImpl(this);
MixedOperation<ProjectRequest, KubernetesResourceList<ProjectRequest>, Resource<ProjectRequest>> op = resources(
ProjectRequest.class, null);

return new ProjectRequestOperation() {

@Override
public ProjectRequest create(ProjectRequest item) {
return op.resource(item).create();
}
};
}

@Override
Expand Down

This file was deleted.

0 comments on commit 1c31544

Please sign in to comment.