Commit0c98b2d

authored and

committed

refactor: explicitly use ProjectSecureFile

1 parentad7c8fa commit0c98b2dCopy full SHA for 0c98b2d

File tree

+15

-13

lines changed

+15

-13

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ References`
`10`	`10`
`11`	`11`	`* v4 API:`
`12`	`12`
`13`		- +:class:`gitlab.v4.objects.SecureFile`
`14`		- +:class:`gitlab.v4.objects.SecureFileManager`
	`13`	+ +:class:`gitlab.v4.objects.ProjectSecureFile`
	`14`	+ +:class:`gitlab.v4.objects.ProjectSecureFileManager`
`15`	`15`	+:attr:`gitlab.v4.objects.Project.secure_files`
`16`	`16`
`17`	`17`	`* GitLab API: https://docs.gitlab.com/ee/api/secure_files.html`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@`
`82`	`82`	`from .releasesimportProjectReleaseManager# noqa: F401`
`83`	`83`	`from .repositoriesimportRepositoryMixin`
`84`	`84`	`from .runnersimportProjectRunnerManager# noqa: F401`
`85`		`-from .secure_filesimportSecureFileManager# noqa: F401`
	`85`	`+from .secure_filesimportProjectSecureFileManager# noqa: F401`
`86`	`86`	`from .snippetsimportProjectSnippetManager# noqa: F401`
`87`	`87`	`from .statisticsimport (# noqa: F401`
`88`	`88`	`ProjectAdditionalStatisticsManager,`
`@@ -210,7 +210,7 @@ class Project(RefreshMixin, SaveMixin, ObjectDeleteMixin, RepositoryMixin, RESTO`
`210`	`210`	`remote_mirrors:"ProjectRemoteMirrorManager"`
`211`	`211`	`repositories:ProjectRegistryRepositoryManager`
`212`	`212`	`runners:ProjectRunnerManager`
`213`		`-secure_files:SecureFileManager`
	`213`	`+secure_files:ProjectSecureFileManager`
`214`	`214`	`services:ProjectServiceManager`
`215`	`215`	`snippets:ProjectSnippetManager`
`216`	`216`	`storage:"ProjectStorageManager"`

Lines changed: 9 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,11 @@`
`13`	`13`	`fromgitlab.mixinsimportNoUpdateMixin,ObjectDeleteMixin`
`14`	`14`	`fromgitlab.typesimportFileAttribute,RequiredOptional`
`15`	`15`
`16`		`-__all__= ["SecureFile","SecureFileManager"]`
	`16`	`+__all__= ["ProjectSecureFile","ProjectSecureFileManager"]`
`17`	`17`
`18`	`18`
`19`		`-classSecureFile(ObjectDeleteMixin,RESTObject):`
`20`		`-@cli.register_custom_action("SecureFile")`
	`19`	`+classProjectSecureFile(ObjectDeleteMixin,RESTObject):`
	`20`	`+@cli.register_custom_action("ProjectSecureFile")`
`21`	`21`	`@exc.on_http_error(exc.GitlabGetError)`
`22`	`22`	`defdownload(`
`23`	`23`	`self,`
`@@ -58,12 +58,14 @@ def download(`
`58`	`58`	`)`
`59`	`59`
`60`	`60`
`61`		`-classSecureFileManager(NoUpdateMixin,RESTManager):`
	`61`	`+classProjectSecureFileManager(NoUpdateMixin,RESTManager):`
`62`	`62`	`_path="/projects/{project_id}/secure_files"`
`63`		`-_obj_cls=SecureFile`
	`63`	`+_obj_cls=ProjectSecureFile`
`64`	`64`	`_from_parent_attrs= {"project_id":"id"}`
`65`	`65`	`_create_attrs=RequiredOptional(required=("name","file"))`
`66`	`66`	`_types= {"file":FileAttribute}`
`67`	`67`
`68`		`-defget(self,id:Union[str,int],lazy:bool=False,**kwargs:Any)->SecureFile:`
`69`		`-returncast(SecureFile,super().get(id=id,lazy=lazy,**kwargs))`
	`68`	`+defget(`
	`69`	`+self,id:Union[str,int],lazy:bool=False,**kwargs:Any`
	`70`	`+ )->ProjectSecureFile:`
	`71`	`+returncast(ProjectSecureFile,super().get(id=id,lazy=lazy,**kwargs))`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`importpytest`
`6`	`6`	`importresponses`
`7`	`7`
`8`		`-fromgitlab.v4.objectsimportSecureFile`
	`8`	`+fromgitlab.v4.objectsimportProjectSecureFile`
`9`	`9`
`10`	`10`	`secure_file_content= {`
`11`	`11`	`"id":1,`
`@@ -93,7 +93,7 @@ def test_create_secure_file(project, resp_create_secure_file):`
`93`	`93`	`deftest_download_secure_file(project,binary_content,resp_download_secure_file):`
`94`	`94`	`secure_file=project.secure_files.get(1)`
`95`	`95`	`secure_content=secure_file.download()`
`96`		`-assertisinstance(secure_file,SecureFile)`
	`96`	`+assertisinstance(secure_file,ProjectSecureFile)`
`97`	`97`	`assertsecure_content==binary_content`
`98`	`98`
`99`	`99`

Comments

(0)